[U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6

All of lore.kernel.org
 help / color / mirror / Atom feed

* [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config
@ 2015-05-22 16:30 Peter Robinson
  2015-05-22 16:30 ` [U-Boot] [PATCH 01/10] novena: standardise mx6_common.h include Peter Robinson
                   ` (10 more replies)
  0 siblings, 11 replies; 27+ messages in thread
From: Peter Robinson @ 2015-05-22 16:30 UTC (permalink / raw)
  To: u-boot

There's a lot of common options in the i.MX6 boards that are repeated across a
lot of the devices. There's a mx6_common.h which is little used but makes sense
to be the central location for all the options we want across all mx6 boards to
ensure a consistent set of features. This is a first pass at moving those options
and unifying the common options to a standard default.

Changes since v2:
* Rebase on imx-uboot master
* Check that CONFIG_MX6 hasn't already been defined
* Check that CONFIG_SYS_TEXT_BASE/CONFIG_BOOTDELAY haven't already been defined
* Don't accidentily drop CONFIG_EFI_PARTITION from tbs2910.h

Changes since v1:
* Move CONFIG_SYS_NO_FLASH changes from patch 7 to patch 2 and reorder includes
so we don't need to undef CONFIG_CMD_FLASH / CONFIG_CMD_IMLS
* Add CONFIG_CMD_GPIO to mx6_common.f (patch 5)
* Use the default for all CONFIG_SYS_PROMPT_HUSH_PS2 (patch 7)
* Drop LZO change (patch 8)

Peter Robinson (10):
      novena: standardise mx6_common.h include
      imx6: move all standard includes to mx6_common.h
      imx6: move generic imx6 options to mx6_common.h
      imx6: move standard ATAG configs to mx6_common.h
      imx6: move MXC_GPIO define to mx6_common.h
      imx6: centralise common boot options in mx6_common.h
      imx6: move generic miscellaneous and overwrite options
      imx6: standardise filesystem and boot options
      imx6: generic MMC config options to mx6_common
      mx6: standardise CONFIG_CMD_CACHE

Reviewed-by: Eric Nelson <eric.nelson@boundarydevices.com>

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 01/10] novena: standardise mx6_common.h include
  2015-05-22 16:30 [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config Peter Robinson
@ 2015-05-22 16:30 ` Peter Robinson
  2015-05-22 16:30 ` [U-Boot] [PATCH 02/10] imx6: move all standard includes to mx6_common.h Peter Robinson
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 27+ messages in thread
From: Peter Robinson @ 2015-05-22 16:30 UTC (permalink / raw)
  To: u-boot

Standardise mx6_common.h to the same as other mx6 boards

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.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>
-- 
2.4.1

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 02/10] imx6: move all standard includes to mx6_common.h
  2015-05-22 16:30 [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config Peter Robinson
  2015-05-22 16:30 ` [U-Boot] [PATCH 01/10] novena: standardise mx6_common.h include Peter Robinson
@ 2015-05-22 16:30 ` Peter Robinson
  2015-05-22 16:30 ` [U-Boot] [PATCH 03/10] imx6: move generic imx6 options " Peter Robinson
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 27+ messages in thread
From: Peter Robinson @ 2015-05-22 16:30 UTC (permalink / raw)
  To: u-boot

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 <pbrobinson@gmail.com>
---
 include/configs/aristainetos.h    | 11 +----------
 include/configs/cgtqmx6eval.h     | 10 +---------
 include/configs/cm_fx6.h          |  6 ------
 include/configs/embestmx6boards.h | 10 +---------
 include/configs/gw_ventana.h      | 10 ----------
 include/configs/mx6_common.h      |  7 +++++++
 include/configs/mx6cuboxi.h       |  7 -------
 include/configs/mx6qarm2.h        |  9 +--------
 include/configs/mx6sabre_common.h | 11 +----------
 include/configs/mx6sabresd.h      |  3 ---
 include/configs/mx6slevk.h        | 10 +---------
 include/configs/mx6sxsabresd.h    |  8 --------
 include/configs/nitrogen6x.h      | 10 +---------
 include/configs/novena.h          |  4 ----
 include/configs/ot1200.h          | 10 +---------
 include/configs/platinum.h        |  7 -------
 include/configs/secomx6quq7.h     | 10 +---------
 include/configs/tbs2910.h         | 10 +---------
 include/configs/titanium.h        |  8 --------
 include/configs/tqma6.h           |  9 ---------
 include/configs/udoo.h            | 10 +---------
 include/configs/wandboard.h       | 10 +---------
 include/configs/warp.h            |  6 ------
 23 files changed, 19 insertions(+), 177 deletions(-)

diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
index cc26790..449da24 100644
--- a/include/configs/aristainetos.h
+++ b/include/configs/aristainetos.h
@@ -16,14 +16,10 @@
 #define CONFIG_MX6
 
 #include "mx6_common.h"
-#include <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,12 +83,9 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Command definition */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_BMODE
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_SETEXPR
-#undef CONFIG_CMD_IMLS
 
 #define CONFIG_BOOTDELAY		3
 
@@ -239,9 +232,7 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-
+/* Environment organization */
 #define CONFIG_ENV_SIZE			(12 * 1024)
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index b189bf1..f8e5e57 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -22,9 +22,6 @@
 
 #define CONFIG_MACH_TYPE	4122
 
-#include <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,9 +59,6 @@
 #define CONFIG_BAUDRATE			       115200
 
 /* Command definition */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_IMLS
 
 #define CONFIG_BOOTDELAY	       3
 
@@ -160,9 +154,7 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-
+/* Environment organization */
 #define CONFIG_ENV_SIZE			(8 * 1024)
 
 #define CONFIG_ENV_IS_IN_MMC
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index d6e5a2b..529e5ab 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -11,8 +11,6 @@
 #ifndef __CONFIG_CM_FX6_H
 #define __CONFIG_CM_FX6_H
 
-#include <asm/arch/imx-regs.h>
-#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 /* Machine config */
@@ -30,14 +28,11 @@
 #define CONFIG_TIMESTAMP
 
 /* CMD */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_GREPENV
-#undef CONFIG_CMD_FLASH
 #undef CONFIG_CMD_LOADB
 #undef CONFIG_CMD_LOADS
 #undef CONFIG_CMD_XIMG
 #undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMLS
 
 /* MMC */
 #define CONFIG_MMC
@@ -77,7 +72,6 @@
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 
 /* SPI flash */
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_BUS		0
 #define CONFIG_SF_DEFAULT_CS		0
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 16b5826..b3ebb84 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -13,11 +13,7 @@
 #ifndef __RIOTBOARD_CONFIG_H
 #define __RIOTBOARD_CONFIG_H
 
-#include <asm/arch/imx-regs.h>
-#include <asm/imx-common/gpio.h>
-
 #include "mx6_common.h"
-#include <linux/sizes.h>
 
 #define CONFIG_SYS_GENERIC_BOARD
 
@@ -108,12 +104,10 @@
 #define CONFIG_BAUDRATE                        115200
 
 /* Command definition */
-#include <config_cmd_default.h>
 #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 7949b12..b01c0ab 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -7,8 +7,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <linux/sizes.h>
-
 /* SPL */
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SUPPORT
@@ -41,9 +39,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
@@ -184,8 +179,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
 #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 e0528ce..85bf039 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 <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 b6f9d4e..9f260bb 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
@@ -107,11 +104,7 @@
 		"setenv stderr serial; " \
 	"fi;"
 
-#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..6233b12 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,9 +60,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Command definition */
-#include <config_cmd_default.h>
-
-#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 b72522b..9b80af5 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,12 +85,9 @@
 #define CONFIG_BAUDRATE                        115200
 
 /* Command definition */
-#include <config_cmd_default.h>
-
 #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 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..36430eb 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,9 +78,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Command definition */
-#include <config_cmd_default.h>
-
-#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 248303c..7c800d0 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,9 +43,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Command definition */
-#include <config_cmd_default.h>
-
-#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 eaa2c2c..1432b86 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,9 +156,6 @@
 #define CONFIG_BAUDRATE			       115200
 
 /* Command definition */
-#include <config_cmd_default.h>
-
-#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 5040c8e..c2e8ae0 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 <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..15c49d9 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,9 +149,6 @@
 #define CONFIG_BAUDRATE                115200
 
 /* Command definition */
-#include <config_cmd_default.h>
-
-#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 91ffc7c..15f619b 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
@@ -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 46ffb7a..b779d78 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,9 +36,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Command definition */
-#include <config_cmd_default.h>
-
-#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 b7ad7df..1fed6d8 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
@@ -72,10 +70,6 @@
 #define CONFIG_CONS_INDEX		1
 
 /* *** Command definition *** */
-#include <config_cmd_default.h>
-
-#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 320d76c..74cb78b 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,9 +91,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Command definition */
-#include <config_cmd_default.h>
-
-#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 66962aa..7ba6b5f 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)
@@ -148,13 +145,10 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Command definition */
-#include <config_cmd_default.h>
-
 #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 b4a6245..7741f68 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,9 +68,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Command definition */
-#include <config_cmd_default.h>
-
-#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 7ce861e..4609f3e 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_SPL_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_MMC_SUPPORT
@@ -48,9 +45,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Command definition */
-#include <config_cmd_default.h>
-
-#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 2eb429e..c066fc5 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
@@ -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 <config_cmd_default.h>
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS
 
-- 
2.4.1

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 03/10] imx6: move generic imx6 options to mx6_common.h
  2015-05-22 16:30 [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config Peter Robinson
  2015-05-22 16:30 ` [U-Boot] [PATCH 01/10] novena: standardise mx6_common.h include Peter Robinson
  2015-05-22 16:30 ` [U-Boot] [PATCH 02/10] imx6: move all standard includes to mx6_common.h Peter Robinson
@ 2015-05-22 16:30 ` Peter Robinson
  2015-05-22 18:18   ` Soeren Moch
  2015-05-22 16:30 ` [U-Boot] [PATCH 04/10] imx6: move standard ATAG configs " Peter Robinson
                   ` (7 subsequent siblings)
  10 siblings, 1 reply; 27+ messages in thread
From: Peter Robinson @ 2015-05-22 16:30 UTC (permalink / raw)
  To: u-boot

All boards define CONFIG_MX6, CONFIG_DISPLAY_BOARDINFO, CONFIG_DISPLAY_CPUINFO
and CONFIG_SYS_GENERIC_BOARD so define them in mx6_common

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
 include/configs/aristainetos.h      | 7 -------
 include/configs/cgtqmx6eval.h       | 5 -----
 include/configs/cm_fx6.h            | 7 -------
 include/configs/embestmx6boards.h   | 7 -------
 include/configs/gw_ventana.h        | 5 -----
 include/configs/mx6_common.h        | 8 ++++++++
 include/configs/mx6cuboxi.h         | 4 ----
 include/configs/mx6qarm2.h          | 7 -------
 include/configs/mx6sabre_common.h   | 7 -------
 include/configs/mx6slevk.h          | 6 ------
 include/configs/mx6sxsabresd.h      | 5 -----
 include/configs/nitrogen6x.h        | 4 ----
 include/configs/novena.h            | 4 ----
 include/configs/ot1200.h            | 4 ----
 include/configs/platinum.h          | 6 ------
 include/configs/platinum_picon.h    | 2 --
 include/configs/platinum_titanium.h | 2 --
 include/configs/secomx6quq7.h       | 4 ----
 include/configs/tbs2910.h           | 4 ----
 include/configs/titanium.h          | 3 ---
 include/configs/tqma6.h             | 6 ------
 include/configs/udoo.h              | 6 ------
 include/configs/wandboard.h         | 6 ------
 include/configs/warp.h              | 5 -----
 24 files changed, 8 insertions(+), 116 deletions(-)

diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
index 449da24..bedbab4 100644
--- a/include/configs/aristainetos.h
+++ b/include/configs/aristainetos.h
@@ -13,20 +13,13 @@
 #ifndef __ARISTAINETOS_CONFIG_H
 #define __ARISTAINETOS_CONFIG_H
 
-#define CONFIG_MX6
-
 #include "mx6_common.h"
 
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_MACH_TYPE	4501
 #define CONFIG_MMCROOT		"/dev/mmcblk0p1"
 #define CONFIG_HOSTNAME		aristainetos
 #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(64 * SZ_1M)
 
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index f8e5e57..211e75f 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -13,13 +13,8 @@
 #ifndef __CONFIG_CGTQMX6EVAL_H
 #define __CONFIG_CGTQMX6EVAL_H
 
-#define CONFIG_MX6
-
 #include "mx6_common.h"
 
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_MACH_TYPE	4122
 
 #define CONFIG_CMDLINE_TAG
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 529e5ab..aae3044 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -14,7 +14,6 @@
 #include "mx6_common.h"
 
 /* Machine config */
-#define CONFIG_MX6
 #define CONFIG_SYS_LITTLE_ENDIAN
 #define CONFIG_MACH_TYPE		4273
 
@@ -22,11 +21,6 @@
 #define CONFIG_CMD_GPIO
 #endif
 
-/* Display information on boot */
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_TIMESTAMP
-
 /* CMD */
 #define CONFIG_CMD_GREPENV
 #undef CONFIG_CMD_LOADB
@@ -271,7 +265,6 @@
 #define CONFIG_SERIAL_TAG
 
 /* misc */
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_STACKSIZE			(128 * 1024)
 #define CONFIG_SYS_MALLOC_LEN			(10 * 1024 * 1024)
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS	800 /* 400 KB */
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index b3ebb84..a033a63 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -15,19 +15,12 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_MXC_UART_BASE		UART2_BASE
 #define CONFIG_CONSOLE_DEV		"ttymxc1"
 #define CONFIG_MMCROOT			"/dev/mmcblk1p2"
 
 #define PHYS_SDRAM_SIZE		(1u * 1024 * 1024 * 1024)
 
-#define CONFIG_MX6
-
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index b01c0ab..1db030b 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -33,9 +33,6 @@
 
 #include "imx6_spl.h"                  /* common IMX6 SPL configuration */
 #include "mx6_common.h"
-#define CONFIG_MX6
-#define CONFIG_DISPLAY_CPUINFO         /* display cpu info */
-#define CONFIG_DISPLAY_BOARDINFO_LATE  /* display board info (after reloc) */
 
 #define CONFIG_MACH_TYPE	4520   /* Gateworks Ventana Platform */
 
@@ -46,8 +43,6 @@
 #define CONFIG_SERIAL_TAG
 #define CONFIG_REVISION_TAG
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(10 * SZ_1M)
 
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 85bf039..0e5706b 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -38,4 +38,12 @@
 #include <asm/imx-common/gpio.h>
 #include <config_cmd_default.h>
 
+#ifndef CONFIG_MX6
+#define CONFIG_MX6
+#endif
+
+#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_DISPLAY_CPUINFO
+#define CONFIG_SYS_GENERIC_BOARD
+
 #endif
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 9f260bb..c434fa2 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -10,19 +10,15 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MX6
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_MMC_SUPPORT
 #include "imx6_spl.h"
 
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
 #define CONFIG_IMX6_THERMAL
-#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_SYS_MALLOC_LEN		(10 * SZ_1M)
 #define CONFIG_BOARD_EARLY_INIT_F
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 6233b12..22ddbb8 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -9,19 +9,12 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MX6
-
 #include "mx6_common.h"
 
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* 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 9b80af5..aed399d 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -9,13 +9,8 @@
 #ifndef __MX6QSABRE_COMMON_CONFIG_H
 #define __MX6QSABRE_COMMON_CONFIG_H
 
-#define CONFIG_MX6
-
 #include "mx6_common.h"
 
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
@@ -23,8 +18,6 @@
 
 #define CONFIG_IMX6_THERMAL
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(10 * SZ_1M)
 
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 36430eb..6fe71ff 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -11,10 +11,6 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MX6
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define MACH_TYPE_MX6SLEVK		4307
 #define CONFIG_MACH_TYPE		MACH_TYPE_MX6SLEVK
 
@@ -23,8 +19,6 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* 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 7c800d0..5e4a406 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -12,10 +12,6 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MX6
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #ifdef CONFIG_SPL
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_MMC_SUPPORT
@@ -26,7 +22,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
-#define CONFIG_SYS_GENERIC_BOARD
 
 /* 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 1432b86..0106c7a 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -11,9 +11,6 @@
 #define __CONFIG_H
 
 #include "mx6_common.h"
-#define CONFIG_MX6
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
 
 #define CONFIG_MACH_TYPE	3769
 
@@ -21,7 +18,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
-#define CONFIG_SYS_GENERIC_BOARD
 
 /* 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 c2e8ae0..0138af8 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -10,19 +10,15 @@
 #define __CONFIG_H
 
 /* System configurations */
-#define CONFIG_MX6
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_MISC_INIT_R
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
 #define CONFIG_FAT_WRITE
 #define CONFIG_FIT
 #define CONFIG_KEYBOARD
 #define CONFIG_MXC_GPIO
 #define CONFIG_OF_LIBFDT
-#define CONFIG_SYS_GENERIC_BOARD
 
 #include "mx6_common.h"
 
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index 15c49d9..1596ad8 100644
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -9,15 +9,11 @@
 #define __CONFIG_H
 
 #include "mx6_common.h"
-#define CONFIG_MX6
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
 
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
-#define CONFIG_SYS_GENERIC_BOARD
 
 /* 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 15f619b..de885ab 100644
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -7,8 +7,6 @@
 #ifndef __PLATINUM_CONFIG_H__
 #define __PLATINUM_CONFIG_H__
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* SPL */
 #define CONFIG_SPL_NAND_SUPPORT
 #define CONFIG_SPL_MMC_SUPPORT
@@ -146,10 +144,6 @@
  * U-Boot configuration
  */
 
-/* Console boot messages */
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 /* Tag config */
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
diff --git a/include/configs/platinum_picon.h b/include/configs/platinum_picon.h
index 4590df5..f5b476f 100644
--- a/include/configs/platinum_picon.h
+++ b/include/configs/platinum_picon.h
@@ -12,8 +12,6 @@
 #define CONFIG_PLATINUM_PROJECT			"picon"
 #define CONFIG_PLATINUM_CPU			"imx6dl"
 
-#define CONFIG_MX6
-
 #include <configs/platinum.h>
 
 #define CONFIG_FEC_XCV_TYPE			RMII
diff --git a/include/configs/platinum_titanium.h b/include/configs/platinum_titanium.h
index 6789655..9bca10f 100644
--- a/include/configs/platinum_titanium.h
+++ b/include/configs/platinum_titanium.h
@@ -12,8 +12,6 @@
 #define CONFIG_PLATINUM_PROJECT			"titanium"
 #define CONFIG_PLATINUM_CPU			"imx6q"
 
-#define CONFIG_MX6
-
 #define PHYS_SDRAM_SIZE				(512 << 20)
 #define CONFIG_SYS_NAND_MAX_CHIPS		1
 
diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h
index b779d78..227dd77 100644
--- a/include/configs/secomx6quq7.h
+++ b/include/configs/secomx6quq7.h
@@ -11,10 +11,6 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_SYS_GENERIC_BOARD
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 1fed6d8..2dbb2ee 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -12,9 +12,6 @@
 #include "mx6_common.h"
 
 /* General configuration */
-#define CONFIG_MX6
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO_LATE
 #define CONFIG_SYS_THUMB_BUILD
 
 #define CONFIG_MACH_TYPE		3980
@@ -23,7 +20,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
-#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MXC_GPIO
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 74cb78b..1b409f6 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -15,10 +15,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MX6
 #define CONFIG_MX6Q
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
 
 #define MACH_TYPE_TITANIUM		3769
 #define CONFIG_MACH_TYPE		MACH_TYPE_TITANIUM
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 7ba6b5f..f7dc1dc 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -9,8 +9,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MX6
-
 /* SPL */
 /* #if defined(CONFIG_SPL_BUILD) */
 
@@ -32,10 +30,6 @@
 #define PHYS_SDRAM_SIZE			(1024u * SZ_1M)
 #endif
 
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index 7741f68..1da5d21 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -11,10 +11,6 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MX6
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define MACH_TYPE_UDOO		4800
 #define CONFIG_MACH_TYPE	MACH_TYPE_UDOO
 
@@ -23,8 +19,6 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* 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 4609f3e..d903c98 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -15,10 +15,6 @@
 #define CONFIG_SPL_MMC_SUPPORT
 #include "imx6_spl.h"
 
-#define CONFIG_MX6
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define MACH_TYPE_WANDBOARD		4412
 #define CONFIG_MACH_TYPE		MACH_TYPE_WANDBOARD
 
@@ -27,8 +23,6 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
 
-#define CONFIG_SYS_GENERIC_BOARD
-
 /* 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 c066fc5..874e8d1 100644
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -15,11 +15,6 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MX6
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_SYS_GENERIC_BOARD
-
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
-- 
2.4.1

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 03/10] imx6: move generic imx6 options to mx6_common.h
  2015-05-22 16:30 ` [U-Boot] [PATCH 03/10] imx6: move generic imx6 options " Peter Robinson
@ 2015-05-22 18:18   ` Soeren Moch
  2015-05-26 11:39     ` Stefano Babic
  0 siblings, 1 reply; 27+ messages in thread
From: Soeren Moch @ 2015-05-22 18:18 UTC (permalink / raw)
  To: u-boot

> All boards define CONFIG_MX6, CONFIG_DISPLAY_BOARDINFO, CONFIG_DISPLAY_CPUINFO
> and CONFIG_SYS_GENERIC_BOARD so define them in mx6_common
>
> Signed-off-by: Peter Robinson<pbrobinson@gmail.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Some boards defineCONFIG_DISPLAY_BOARDINFO_LATE (instead of
CONFIG_DISPLAY_BOARDINFO) to also see this info on HDMI.

So please add CONFIG_DISPLAY_BOARDINFO_LATE to mx6_common.h

Sorry, I missed this in the last review round.

Regards,
Soeren

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 03/10] imx6: move generic imx6 options to mx6_common.h
  2015-05-22 18:18   ` Soeren Moch
@ 2015-05-26 11:39     ` Stefano Babic
  2015-05-26 12:10       ` Soeren Moch
  0 siblings, 1 reply; 27+ messages in thread
From: Stefano Babic @ 2015-05-26 11:39 UTC (permalink / raw)
  To: u-boot

Hi Soeren,

On 22/05/2015 20:18, Soeren Moch wrote:
>> All boards define CONFIG_MX6, CONFIG_DISPLAY_BOARDINFO,
>> CONFIG_DISPLAY_CPUINFO
>> and CONFIG_SYS_GENERIC_BOARD so define them in mx6_common
>>
>> Signed-off-by: Peter Robinson<pbrobinson@gmail.com>
>> Reviewed-by: Tom Rini <trini@konsulko.com>
> 
> Some boards defineCONFIG_DISPLAY_BOARDINFO_LATE (instead of
> CONFIG_DISPLAY_BOARDINFO) to also see this info on HDMI.
> 
> So please add CONFIG_DISPLAY_BOARDINFO_LATE to mx6_common.h
> 
> Sorry, I missed this in the last review round.

As far as I can see, there are only two boards : gw_ventana and tbs2910.
CONFIG_DISPLAY_BOARDINFO_LATE enables show_board_info(), and this is not
weak, printing twice if we have both CONFIG_DISPLAY_BOARDINFO_LATE and
CONFIG_DISPLAY_BOARDINFO. I would suggest that we add
	#undef CONFIG_DISPLAY_BOARDINFO
	#define CONFIG_DISPLAY_BOARDINFO_LATE

to gw_ventana.h and tbs2910.h after applying this series.

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 03/10] imx6: move generic imx6 options to mx6_common.h
  2015-05-26 11:39     ` Stefano Babic
@ 2015-05-26 12:10       ` Soeren Moch
  2015-05-29 18:02         ` Soeren Moch
  0 siblings, 1 reply; 27+ messages in thread
From: Soeren Moch @ 2015-05-26 12:10 UTC (permalink / raw)
  To: u-boot

On 05/26/15 13:39, Stefano Babic wrote:
> Hi Soeren,
>
> On 22/05/2015 20:18, Soeren Moch wrote:
>>> All boards define CONFIG_MX6, CONFIG_DISPLAY_BOARDINFO,
>>> CONFIG_DISPLAY_CPUINFO
>>> and CONFIG_SYS_GENERIC_BOARD so define them in mx6_common
>>>
>>> Signed-off-by: Peter Robinson<pbrobinson@gmail.com>
>>> Reviewed-by: Tom Rini <trini@konsulko.com>
>>
>> Some boards defineCONFIG_DISPLAY_BOARDINFO_LATE (instead of
>> CONFIG_DISPLAY_BOARDINFO) to also see this info on HDMI.
>>
>> So please add CONFIG_DISPLAY_BOARDINFO_LATE to mx6_common.h
>>
>> Sorry, I missed this in the last review round.
>
> As far as I can see, there are only two boards : gw_ventana and tbs2910.
> CONFIG_DISPLAY_BOARDINFO_LATE enables show_board_info(), and this is not
> weak, printing twice if we have both CONFIG_DISPLAY_BOARDINFO_LATE and
> CONFIG_DISPLAY_BOARDINFO. I would suggest that we add
> 	#undef CONFIG_DISPLAY_BOARDINFO
> 	#define CONFIG_DISPLAY_BOARDINFO_LATE
>
> to gw_ventana.h and tbs2910.h after applying this series.

Stefano,

OK, fine with me.

It is unfortunate that there is no CONFIG_DISPLAY_CPUINFO_LATE.
The real solution would be to print both board and cpu info
after enabling the HDMI frame buffer. BOARDINFO_LATE alone
is not that important. So I agree to apply this patch series
without another fix.

Maybe we should add
#ifndef CONFIG_DISPLAY_BOARDINFO_LATE
#define CONFIG_DISPLAY_BOARDINFO
#endif
to mx6_common.h later. There are already other conditional defines
in there, and that could save the #undef in individual board files.
And, of course, you are right, printing the board info twice (in
serial output) can also be confusing.

Regards,
Soeren

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 03/10] imx6: move generic imx6 options to mx6_common.h
  2015-05-26 12:10       ` Soeren Moch
@ 2015-05-29 18:02         ` Soeren Moch
  0 siblings, 0 replies; 27+ messages in thread
From: Soeren Moch @ 2015-05-29 18:02 UTC (permalink / raw)
  To: u-boot

Stefano,
>> As far as I can see, there are only two boards : gw_ventana and tbs2910.
>> CONFIG_DISPLAY_BOARDINFO_LATE enables show_board_info(), and this is not
>> weak, printing twice if we have both CONFIG_DISPLAY_BOARDINFO_LATE and
>> CONFIG_DISPLAY_BOARDINFO. I would suggest that we add
>>     #undef CONFIG_DISPLAY_BOARDINFO
>>     #define CONFIG_DISPLAY_BOARDINFO_LATE
>>
>> to gw_ventana.h and tbs2910.h after applying this series.
>
>
> It is unfortunate that there is no CONFIG_DISPLAY_CPUINFO_LATE.
> The real solution would be to print both board and cpu info
> after enabling the HDMI frame buffer. BOARDINFO_LATE alone
> is not that important. So I agree to apply this patch series
> without another fix.
>
> Maybe we should add
> #ifndef CONFIG_DISPLAY_BOARDINFO_LATE
> #define CONFIG_DISPLAY_BOARDINFO
> #endif
> to mx6_common.h later. There are already other conditional defines
> in there, and that could save the #undef in individual board files.

I will add a PRE_CONSOLE_BUFFER to tbs2910.h , so there is no
need anymore to add CONFIG_DISPLAY_BOARDINFO_LATE.

I'm fine with the merged consolidation series, no further action required
on this topic from my side.

Regards,
Soeren

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 04/10] imx6: move standard ATAG configs to mx6_common.h
  2015-05-22 16:30 [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config Peter Robinson
                   ` (2 preceding siblings ...)
  2015-05-22 16:30 ` [U-Boot] [PATCH 03/10] imx6: move generic imx6 options " Peter Robinson
@ 2015-05-22 16:30 ` Peter Robinson
  2015-05-22 16:30 ` [U-Boot] [PATCH 05/10] imx6: move MXC_GPIO define " Peter Robinson
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 27+ messages in thread
From: Peter Robinson @ 2015-05-22 16:30 UTC (permalink / raw)
  To: u-boot

Define the standard ATAG consfigs in mx6_common.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
 include/configs/cgtqmx6eval.h     | 5 -----
 include/configs/cm_fx6.h          | 4 ----
 include/configs/embestmx6boards.h | 4 ----
 include/configs/gw_ventana.h      | 6 +-----
 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 -----
 21 files changed, 7 insertions(+), 96 deletions(-)

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index 211e75f..ba30cfc 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 aae3044..8b89278 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -257,11 +257,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 a033a63..e86c831 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -21,10 +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
 #define CONFIG_IMX6_THERMAL
 
 /* Size of malloc() pool */
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 1db030b..2169ef1 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -36,12 +36,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 * SZ_1M)
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 0e5706b..33c6203 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -46,4 +46,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 c434fa2..5fc7a8c 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		(10 * SZ_1M)
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 22ddbb8..7a124e0 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 aed399d..ad288f4 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 6fe71ff..2fbb0df 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 5e4a406..e1abbcf 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 0106c7a..ecfc393 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 0138af8..841edac 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -110,11 +110,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 1596ad8..afd9385 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 de885ab..75d459f 100644
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -144,12 +144,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 227dd77..60d8416 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 2dbb2ee..0abb092 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 1b409f6..f09ad8b 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 f7dc1dc..b929d8d 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 1da5d21..c51e05a 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 d903c98..1ec23ee 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -18,11 +18,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 874e8d1..83afc7f 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 */
 
-- 
2.4.1

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 05/10] imx6: move MXC_GPIO define to mx6_common.h
  2015-05-22 16:30 [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config Peter Robinson
                   ` (3 preceding siblings ...)
  2015-05-22 16:30 ` [U-Boot] [PATCH 04/10] imx6: move standard ATAG configs " Peter Robinson
@ 2015-05-22 16:30 ` Peter Robinson
  2015-05-22 16:30 ` [U-Boot] [PATCH 06/10] imx6: centralise common boot options in mx6_common.h Peter Robinson
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 27+ messages in thread
From: Peter Robinson @ 2015-05-22 16:30 UTC (permalink / raw)
  To: u-boot

Define CONFIG_MXC_GPIO and CONFIG_CMD_GPIO by default in mx6_common

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
 include/configs/aristainetos.h    | 2 --
 include/configs/cgtqmx6eval.h     | 1 -
 include/configs/cm_fx6.h          | 7 -------
 include/configs/embestmx6boards.h | 1 -
 include/configs/mx6_common.h      | 4 ++++
 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 -
 21 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
index bedbab4..a883a37 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
@@ -251,7 +250,6 @@
 #define CONFIG_SYS_I2C_SLAVE		0x7f
 #define CONFIG_SYS_I2C_NOPROBES		{ {0, 0x00} }
 
-#define CONFIG_CMD_GPIO
 #define CONFIG_GPIO_ENABLE_SPI_FLASH	IMX_GPIO_NR(2, 15)
 
 /* NAND stuff */
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index ba30cfc..ced4d6c 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 8b89278..5ef7ba7 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -17,10 +17,6 @@
 #define CONFIG_SYS_LITTLE_ENDIAN
 #define CONFIG_MACH_TYPE		4273
 
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_CMD_GPIO
-#endif
-
 /* CMD */
 #define CONFIG_CMD_GREPENV
 #undef CONFIG_CMD_LOADB
@@ -250,9 +246,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 e86c831..775ac41 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -28,7 +28,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/mx6_common.h b/include/configs/mx6_common.h
index 33c6203..ae25640 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -52,4 +52,8 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
 
+/* GPIO */
+#define CONFIG_MXC_GPIO
+#define CONFIG_CMD_GPIO
+
 #endif
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 5fc7a8c..f42db85 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -19,7 +19,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(10 * 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 7a124e0..77b0d87 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 ad288f4..b08f006 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 2fbb0df..8b450c5 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 e1abbcf..72b87a2 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 ecfc393..7922bbd 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 841edac..5bdc22d 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
 
 #include "mx6_common.h"
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index afd9385..4476e01 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 75d459f..b192c3f 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
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_MMC
@@ -44,9 +43,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 60d8416..adc6d7f 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 0abb092..2e37a5c 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 f09ad8b..0aa2ba2 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 b929d8d..bb63caa 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 c51e05a..9fa18f5 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 1ec23ee..2d0af1a 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -23,7 +23,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 83afc7f..1c8b71f 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
-- 
2.4.1

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 06/10] imx6: centralise common boot options in mx6_common.h
  2015-05-22 16:30 [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config Peter Robinson
                   ` (4 preceding siblings ...)
  2015-05-22 16:30 ` [U-Boot] [PATCH 05/10] imx6: move MXC_GPIO define " Peter Robinson
@ 2015-05-22 16:30 ` Peter Robinson
  2015-05-22 16:30 ` [U-Boot] [PATCH 07/10] imx6: move generic miscellaneous and overwrite options Peter Robinson
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 27+ messages in thread
From: Peter Robinson @ 2015-05-22 16:30 UTC (permalink / raw)
  To: u-boot

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/mx6_common.h      | 10 ++++++++++
 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 -------
 22 files changed, 10 insertions(+), 124 deletions(-)

diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
index a883a37..42531f0 100644
--- a/include/configs/aristainetos.h
+++ b/include/configs/aristainetos.h
@@ -79,11 +79,6 @@
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_SETEXPR
 
-#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" \
@@ -206,8 +201,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 ced4d6c..db454a5 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -49,11 +49,6 @@
 
 /* Command definition */
 
-#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 \
@@ -125,8 +120,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 5ef7ba7..2a152e1 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -247,9 +247,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 775ac41..835471f 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -97,9 +97,6 @@
 #define CONFIG_CMD_BMODE
 #define CONFIG_CMD_SETEXPR
 
-#define CONFIG_LOADADDR                        0x12000000
-#define CONFIG_SYS_TEXT_BASE           0x17800000
-
 #define CONFIG_ARP_TIMEOUT     200UL
 
 /* Miscellaneous configurable options */
@@ -115,8 +112,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 2169ef1..5d96c62 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -270,8 +270,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
@@ -328,8 +326,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/mx6_common.h b/include/configs/mx6_common.h
index ae25640..ffe9bbd 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -52,6 +52,16 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
 
+/* Boot options */
+#define CONFIG_LOADADDR		0x12000000
+#define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
+#ifndef CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_TEXT_BASE	0x17800000
+#endif
+#ifndef CONFIG_BOOTDELAY
+#define CONFIG_BOOTDELAY	3
+#endif
+
 /* GPIO */
 #define CONFIG_MXC_GPIO
 #define CONFIG_CMD_GPIO
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index f42db85..2e90b83 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -99,11 +99,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"
@@ -217,8 +212,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 77b0d87..6694fb2 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -49,11 +49,6 @@
 
 /* Command definition */
 
-#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" \
@@ -142,8 +137,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 b08f006..f66c822 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -76,11 +76,6 @@
 #define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_SETEXPR
 
-#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" \
@@ -204,8 +199,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 8b450c5..e48059c 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -67,11 +67,6 @@
 
 /* Command definition */
 
-#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" \
@@ -158,8 +153,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 72b87a2..474f801 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -33,11 +33,6 @@
 
 /* Command definition */
 
-#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" \
@@ -124,8 +119,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 7922bbd..6c80f18 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -146,13 +146,8 @@
 
 /* Command definition */
 
-#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
@@ -319,8 +314,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 5bdc22d..801d01b 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -77,12 +77,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 4476e01..c8e0d11 100644
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -140,13 +140,8 @@
 
 /* Command definition */
 
-#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
@@ -157,8 +152,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 b192c3f..51f7baa 100644
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -150,14 +150,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 */
@@ -176,8 +172,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 adc6d7f..92ff9ab 100644
--- a/include/configs/secomx6quq7.h
+++ b/include/configs/secomx6quq7.h
@@ -31,12 +31,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
@@ -110,7 +106,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 2e37a5c..eef77c8 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
@@ -45,9 +44,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 0aa2ba2..9776aeb 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -83,11 +83,6 @@
 
 /* Command definition */
 
-#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))
 
@@ -181,8 +176,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 bb63caa..cdb0eb1 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -138,10 +138,6 @@
 #define CONFIG_CMD_ITEST
 #define CONFIG_CMD_SETEXPR
 
-#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
@@ -407,8 +403,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 9fa18f5..86899c4 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -60,12 +60,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
@@ -181,8 +177,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 2d0af1a..61d673e 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -37,12 +37,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
@@ -242,8 +238,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 1c8b71f..c9e510f 100644
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -50,11 +50,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
@@ -71,8 +66,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
 
-- 
2.4.1

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 07/10] imx6: move generic miscellaneous and overwrite options
  2015-05-22 16:30 [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config Peter Robinson
                   ` (5 preceding siblings ...)
  2015-05-22 16:30 ` [U-Boot] [PATCH 06/10] imx6: centralise common boot options in mx6_common.h Peter Robinson
@ 2015-05-22 16:30 ` Peter Robinson
  2015-05-22 16:30 ` [U-Boot] [PATCH 08/10] imx6: standardise filesystem and boot options Peter Robinson
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 27+ messages in thread
From: Peter Robinson @ 2015-05-22 16:30 UTC (permalink / raw)
  To: u-boot

 Move generic miscellaneous options that are standard across most, if not all,
 mx6 boards to central mx6_common define to ensure consistent features.

 Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
 include/configs/aristainetos.h    | 14 --------------
 include/configs/cgtqmx6eval.h     | 15 ---------------
 include/configs/cm_fx6.h          |  4 ----
 include/configs/embestmx6boards.h | 11 -----------
 include/configs/gw_ventana.h      | 12 ------------
 include/configs/mx6_common.h      | 16 ++++++++++++++++
 include/configs/mx6cuboxi.h       | 16 ----------------
 include/configs/mx6qarm2.h        | 17 -----------------
 include/configs/mx6sabre_common.h | 15 ---------------
 include/configs/mx6slevk.h        | 16 ----------------
 include/configs/mx6sxsabresd.h    | 16 ----------------
 include/configs/nitrogen6x.h      | 17 -----------------
 include/configs/novena.h          | 11 -----------
 include/configs/ot1200.h          | 16 ----------------
 include/configs/platinum.h        | 14 --------------
 include/configs/secomx6quq7.h     | 16 ----------------
 include/configs/tbs2910.h         |  6 ------
 include/configs/titanium.h        | 16 ----------------
 include/configs/tqma6.h           | 16 ----------------
 include/configs/udoo.h            | 16 ----------------
 include/configs/wandboard.h       | 16 ----------------
 include/configs/warp.h            | 14 --------------
 22 files changed, 16 insertions(+), 294 deletions(-)

diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
index 42531f0..bd93db2 100644
--- a/include/configs/aristainetos.h
+++ b/include/configs/aristainetos.h
@@ -69,10 +69,6 @@
 #define CONFIG_SF_DEFAULT_SPEED		20000000
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
 #define CONFIG_SYS_SPI_ST_ENABLE_WP_PIN
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX		1
-#define CONFIG_BAUDRATE			115200
 
 /* Command definition */
 #define CONFIG_CMD_BMODE
@@ -185,23 +181,13 @@
 
 #define CONFIG_ARP_TIMEOUT		200UL
 
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		256
-
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS             16
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
 
 #define CONFIG_SYS_MEMTEST_START	PHYS_SDRAM
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 0x100000)
 #define CONFIG_SYS_MEMTEST_SCRATCH	0x10800000
 
-#define CONFIG_CMDLINE_EDITING
 #define CONFIG_STACKSIZE		(128 * 1024)
 
 /* Physical Memory Map */
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index db454a5..352b821 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -42,13 +42,6 @@
 /* Miscellaneous commands */
 #define CONFIG_CMD_BMODE
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX	       1
-#define CONFIG_BAUDRATE			       115200
-
-/* Command definition */
-
 #define CONFIG_DEFAULT_FDT_FILE "imx6q-congatec.dtb"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -105,23 +98,15 @@
 	   "else echo ERR: Fail to boot from mmc; fi"
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT	       "CGT-QMX6-Quad U-Boot > "
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE	       256
 
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS	       16
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
 
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END	       0x10010000
 #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
 
-#define CONFIG_CMDLINE_EDITING
-
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS	       1
 #define PHYS_SDRAM		       MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 2a152e1..663e04b 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -55,9 +55,6 @@
 
 /* Shell */
 #define CONFIG_SYS_PROMPT	"CM-FX6 # "
-#define CONFIG_SYS_CBSIZE	1024
-#define CONFIG_SYS_MAXARGS	16
-#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 
@@ -69,7 +66,6 @@
 #define CONFIG_SF_DEFAULT_MODE		(SPI_MODE_0)
 
 /* Environment */
-#define CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_MAX_HZ		CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_ENV_SPI_MODE		CONFIG_SF_DEFAULT_MODE
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 835471f..d2fb979 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -86,11 +86,6 @@
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
 #endif
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX              1
-#define CONFIG_BAUDRATE                        115200
-
 /* Command definition */
 #undef CONFIG_CMD_FPGA
 
@@ -99,14 +94,8 @@
 
 #define CONFIG_ARP_TIMEOUT     200UL
 
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
-#define CONFIG_SYS_CBSIZE              256
-
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS             16
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
 
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END         0x10010000
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 5d96c62..a7aad82 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -248,23 +248,12 @@
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 
-/* serial console (ttymxc1,115200) */
-#define CONFIG_CONS_INDEX              1
-#define CONFIG_BAUDRATE                115200
-
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT	             "Ventana > "
-#define CONFIG_SYS_CBSIZE	             1024
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
 #define CONFIG_HWCONFIG
 
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS	           16
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
 
 /* Memory configuration */
 #define CONFIG_SYS_MEMTEST_START       0x10000000
@@ -299,7 +288,6 @@
 #endif
 
 /* Persistent Environment Config */
-#define CONFIG_ENV_OVERWRITE    /* allow to overwrite serial and ethaddr */
 #ifdef CONFIG_SPI_FLASH
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #else
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index ffe9bbd..07fc3e8 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -62,6 +62,22 @@
 #define CONFIG_BOOTDELAY	3
 #endif
 
+/* allow to overwrite serial and ethaddr */
+#define CONFIG_ENV_OVERWRITE
+#define CONFIG_CONS_INDEX       1
+#define CONFIG_BAUDRATE         115200
+
+/* Miscellaneous configurable options */
+#define CONFIG_SYS_NO_FLASH
+#undef CONFIG_CMD_IMLS
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_SYS_HUSH_PARSER
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_AUTO_COMPLETE
+#define CONFIG_SYS_CBSIZE	512
+#define CONFIG_SYS_MAXARGS	32
+#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE
+
 /* GPIO */
 #define CONFIG_MXC_GPIO
 #define CONFIG_CMD_GPIO
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 2e90b83..5bddcbc 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -49,11 +49,6 @@
 #define CONFIG_PHYLIB
 #define CONFIG_PHY_ATHEROS
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX		1
-#define CONFIG_BAUDRATE			115200
-
 /* Framebuffer */
 #define CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3
@@ -214,17 +209,6 @@
 
 #define CONFIG_CMDLINE_EDITING
 
-/* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS           1
-#define CONFIG_SYS_SDRAM_BASE          MMDC0_ARB_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
-
-#define CONFIG_SYS_INIT_SP_OFFSET \
-	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR \
-	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-
 /* Environment organization */
 #define CONFIG_ENV_SIZE			(8 * 1024)
 #define CONFIG_ENV_IS_IN_MMC
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 6694fb2..720d430 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -42,13 +42,6 @@
 #define	CONFIG_FEC_XCV_TYPE		RGMII
 #define CONFIG_FEC_MXC_PHYADDR		0
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX		1
-#define CONFIG_BAUDRATE			115200
-
-/* Command definition */
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
@@ -126,19 +119,9 @@
 #define CONFIG_ARP_TIMEOUT	200UL
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		256
-
-#define CONFIG_SYS_MAXARGS		16
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-
 #define CONFIG_SYS_MEMTEST_START	0x10000000
 #define CONFIG_SYS_MEMTEST_END		0x10010000
 
-#define CONFIG_CMDLINE_EDITING
-
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS		1
 #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index f66c822..f7e69d7 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -66,11 +66,6 @@
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
 #endif
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX              1
-#define CONFIG_BAUDRATE                        115200
-
 /* Command definition */
 #define CONFIG_CMD_BMODE
 #define CONFIG_CMD_BOOTZ
@@ -186,20 +181,10 @@
 
 #define CONFIG_ARP_TIMEOUT     200UL
 
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE              256
-#define CONFIG_SYS_MAXARGS             16
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END         0x10010000
 #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
 
-#define CONFIG_CMDLINE_EDITING
 #define CONFIG_STACKSIZE               (128 * 1024)
 
 /* Physical Memory Map */
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index e48059c..2cced5d 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -60,13 +60,6 @@
 #define CONFIG_PHYLIB
 #define CONFIG_PHY_SMSC
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX		1
-#define CONFIG_BAUDRATE			115200
-
-/* Command definition */
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
@@ -142,18 +135,9 @@
 	   "else run netboot; fi"
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		256
-
-#define CONFIG_SYS_MAXARGS		16
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-
 #define CONFIG_SYS_MEMTEST_START	0x80000000
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + SZ_512M)
 
-#define CONFIG_CMDLINE_EDITING
 #define CONFIG_STACKSIZE		SZ_128K
 
 /* Physical Memory Map */
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 474f801..a2f03d6 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -26,13 +26,6 @@
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART1_BASE
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX		1
-#define CONFIG_BAUDRATE			115200
-
-/* Command definition */
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
@@ -108,18 +101,9 @@
 	   "else run netboot; fi"
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		1024
-
-#define CONFIG_SYS_MAXARGS		256
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-
 #define CONFIG_SYS_MEMTEST_START	0x80000000
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 0x10000)
 
-#define CONFIG_CMDLINE_EDITING
 #define CONFIG_STACKSIZE		SZ_128K
 
 /* Physical Memory Map */
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 6c80f18..62d4dd9 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -139,13 +139,6 @@
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX	       1
-#define CONFIG_BAUDRATE			       115200
-
-/* Command definition */
-
 #define CONFIG_PREBOOT                 ""
 
 #ifdef CONFIG_CMD_SATA
@@ -302,20 +295,10 @@
 
 #endif
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT	       "U-Boot > "
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE	       1024
-#define CONFIG_SYS_MAXARGS	       48
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END	       0x10010000
 #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
 
-#define CONFIG_CMDLINE_EDITING
-
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS	       1
 #define PHYS_SDRAM		       MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 801d01b..d75ccc8 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -46,18 +46,9 @@
 #define CONFIG_VIDEO
 
 /* U-Boot general configurations */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O buffer size */
-#define CONFIG_SYS_MAXARGS	32		/* Max number of command args */
-#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE
-						/* Boot argument buffer size */
 #define CONFIG_VERSION_VARIABLE			/* U-BOOT version */
-#define CONFIG_AUTO_COMPLETE			/* Command auto complete */
-#define CONFIG_CMDLINE_EDITING			/* Command history etc */
-#define CONFIG_SYS_HUSH_PARSER
 
 /* U-Boot environment */
-#define CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_SIZE			(16 * 1024)
 /*
  * Environment is on MMC, starting at offset 512KiB from start of the card.
@@ -179,8 +170,6 @@
 /* UART */
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART2_BASE
-#define CONFIG_BAUDRATE			115200
-#define CONFIG_CONS_INDEX		1
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index c8e0d11..f3c5205 100644
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -133,26 +133,10 @@
 #define CONFIG_CMD_BMODE
 #define CONFIG_CMD_SETEXPR
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX              1
-#define CONFIG_BAUDRATE                115200
-
-/* Command definition */
-
 #define CONFIG_PREBOOT                 ""
 
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_CBSIZE              1024
-
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS             16
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-
-#define CONFIG_CMDLINE_EDITING
 
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS           1
diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index 51f7baa..c4ca7b9 100644
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -46,8 +46,6 @@
 /* UART config */
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE			UART1_BASE
-#define CONFIG_BAUDRATE				115200
-#define CONFIG_CONS_INDEX			1
 
 /* I2C config */
 #define CONFIG_SYS_I2C
@@ -144,9 +142,6 @@
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MISC_INIT_R
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
 /* Device tree support */
 #define CONFIG_OF_LIBFDT
 
@@ -157,20 +152,11 @@
 #define CONFIG_BOOTCOMMAND			"run bootubi_scr"
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
-
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
 #define CONFIG_PREBOOT
 
-#define CONFIG_SYS_CBSIZE			256
-
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE			(CONFIG_SYS_CBSIZE + \
 						 sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS			16
-#define CONFIG_SYS_BARGSIZE			CONFIG_SYS_CBSIZE
 
 /* MTD/UBI/UBIFS config */
 #define CONFIG_LZO
diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h
index 92ff9ab..d34064f 100644
--- a/include/configs/secomx6quq7.h
+++ b/include/configs/secomx6quq7.h
@@ -21,13 +21,7 @@
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART2_BASE
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX		1
-#define CONFIG_BAUDRATE			115200
-
 /* Command definition */
-
 #define CONFIG_CMD_BMODE
 #define CONFIG_CMD_SETEXPR
 
@@ -93,24 +87,14 @@
 
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT		"SECO MX6Q uQ7 U-Boot > "
 
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		256
-
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE +		\
 					 sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS		16
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
 #define CONFIG_SYS_HZ			1000
 
-#define CONFIG_CMDLINE_EDITING
-
-
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS		1
 #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index eef77c8..de73dd3 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -18,13 +18,7 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F
 
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT		"Matrix U-Boot> "
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_MAXARGS		16
-#define CONFIG_SYS_CBSIZE		1024
 #define CONFIG_SYS_HZ			1000
 
 /* Physical Memory Map */
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 9776aeb..dc875b5 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -76,13 +76,6 @@
 /* Miscellaneous commands */
 #define CONFIG_CMD_BMODE
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX		1
-#define CONFIG_BAUDRATE			115200
-
-/* Command definition */
-
 #define CONFIG_SYS_MEMTEST_START	0x10000000
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (500 << 20))
 
@@ -161,20 +154,11 @@
 #define CONFIG_BOOTCOMMAND		"run nand_ubifs"
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT		"Titanium > "
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_CONSOLE_INFO_QUIET	/* don't print console @ startup */
-
-#define CONFIG_SYS_CBSIZE		256
 
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					 sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS		16
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS		1
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index cdb0eb1..7bcd411 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -127,11 +127,6 @@
 #define CONFIG_TFTP_BLOCKSIZE	4096
 #define CONFIG_NFS_READ_SIZE	4096
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX		1
-#define CONFIG_BAUDRATE			115200
-
 /* Command definition */
 #define CONFIG_CMD_BMODE
 #define CONFIG_CMD_BOOTZ
@@ -389,21 +384,10 @@
 	"panicboot=echo No boot device !!! reset\0"                            \
 	TQMA6_EXTRA_BOOTDEV_ENV_SETTINGS                                      \
 
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		512
-
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					 sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS		16
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
-#define CONFIG_CMDLINE_EDITING
 #define CONFIG_STACKSIZE		(128u * SZ_1K)
 
 /* Physical Memory Map */
diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index 86899c4..478754d 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -50,13 +50,7 @@
 #define CONFIG_PHY_MICREL
 #define CONFIG_PHY_MICREL_KSZ9031
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX		1
-#define CONFIG_BAUDRATE			115200
-
 /* Command definition */
-
 #define CONFIG_CMD_BMODE
 #define CONFIG_CMD_SETEXPR
 
@@ -166,18 +160,8 @@
 		   "fi; " \
 	   "else run netboot; fi"
 
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		256
-
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS	       16
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-
-#define CONFIG_CMDLINE_EDITING
 
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS		1
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 61d673e..f439413 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -27,13 +27,7 @@
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART1_BASE
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX		1
-#define CONFIG_BAUDRATE			115200
-
 /* Command definition */
-
 #define CONFIG_CMD_BMODE
 #define CONFIG_CMD_SETEXPR
 
@@ -230,16 +224,6 @@
 		   "fi; " \
 	   "else run netboot; fi"
 
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		256
-#define CONFIG_SYS_MAXARGS	       16
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-
-#define CONFIG_CMDLINE_EDITING
-
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS		1
 #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/warp.h b/include/configs/warp.h
index c9e510f..e9088a2 100644
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -41,32 +41,18 @@
 #define CONFIG_CMD_FAT
 #define CONFIG_DOS_PARTITION
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX		1
-#define CONFIG_BAUDRATE			115200
-
 /* Command definition */
 #undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS
 
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE		256
-
 /* Watchdog */
 #define CONFIG_HW_WATCHDOG
 #define CONFIG_IMX_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* 30s */
-#define CONFIG_SYS_MAXARGS		16
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
 
 #define CONFIG_SYS_MEMTEST_START	0x80000000
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + SZ_256M)
 
-#define CONFIG_CMDLINE_EDITING
 #define CONFIG_STACKSIZE		SZ_128K
 
 /* Physical Memory Map */
-- 
2.4.1

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 08/10] imx6: standardise filesystem and boot options
  2015-05-22 16:30 [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config Peter Robinson
                   ` (6 preceding siblings ...)
  2015-05-22 16:30 ` [U-Boot] [PATCH 07/10] imx6: move generic miscellaneous and overwrite options Peter Robinson
@ 2015-05-22 16:30 ` Peter Robinson
  2015-05-22 18:48   ` Soeren Moch
  2015-05-22 16:30 ` [U-Boot] [PATCH 09/10] imx6: generic MMC config options to mx6_common Peter Robinson
                   ` (2 subsequent siblings)
  10 siblings, 1 reply; 27+ messages in thread
From: Peter Robinson @ 2015-05-22 16:30 UTC (permalink / raw)
  To: u-boot

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

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
 include/configs/aristainetos.h    |  9 +--------
 include/configs/cgtqmx6eval.h     |  6 ------
 include/configs/gw_ventana.h      |  9 +--------
 include/configs/mx6_common.h      | 11 +++++++++++
 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        |  6 ------
 include/configs/secomx6quq7.h     |  6 ------
 include/configs/tbs2910.h         |  8 --------
 include/configs/titanium.h        |  7 -------
 include/configs/tqma6.h           |  8 --------
 include/configs/udoo.h            |  6 ------
 include/configs/wandboard.h       |  6 ------
 include/configs/warp.h            |  8 --------
 20 files changed, 13 insertions(+), 142 deletions(-)

diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
index bd93db2..920e876 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 \
@@ -215,8 +211,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
@@ -253,7 +247,6 @@
 
 /* USB Configs */
 #define CONFIG_CMD_USB
-#define CONFIG_CMD_FAT
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_STORAGE
@@ -266,11 +259,11 @@
 #define ARISTAINETOS_USB_H1_PWR		IMX_GPIO_NR(3, 31)
 
 /* UBI support */
+#define CONFIG_LZO
 #define CONFIG_CMD_MTDPARTS
 #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 a7aad82..215c92c 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -127,12 +127,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
@@ -177,12 +172,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
@@ -275,6 +268,7 @@
 /*
  * MTD Command for mtdparts
  */
+#define CONFIG_LZO
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
@@ -466,7 +460,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/mx6_common.h b/include/configs/mx6_common.h
index 07fc3e8..c323038 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -67,6 +67,17 @@
 #define CONFIG_CONS_INDEX       1
 #define CONFIG_BAUDRATE         115200
 
+/* Filesystems and image support */
+#define CONFIG_OF_LIBFDT
+#define CONFIG_CMD_BOOTZ
+#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 5bddcbc..e9af5d1 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
@@ -91,7 +87,6 @@
 	"fi;"
 
 /* Command definition */
-#define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_SETEXPR
 
 #define CONFIG_MXC_UART_BASE	UART1_BASE
@@ -214,7 +209,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 f7e69d7..0abe38f 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
@@ -209,8 +203,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 62d4dd9..c260d92 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
@@ -333,9 +327,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
@@ -346,10 +337,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 c4ca7b9..b8ba9f9 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
@@ -142,9 +139,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))
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 de73dd3..01cd0f6 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -56,15 +56,7 @@
 #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 dc875b5..f3d11fa 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
@@ -220,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 7bcd411..13ce4ab 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -104,13 +104,6 @@
 #define CONFIG_MXC_OCOTP
 #define CONFIG_CMD_FUSE
 
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_EXT4
-#define CONFIG_CMD_EXT4_WRITE
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_FS_GENERIC
-#define CONFIG_DOS_PARTITION
-
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII
@@ -129,7 +122,6 @@
 
 /* Command definition */
 #define CONFIG_CMD_BMODE
-#define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_ITEST
 #define CONFIG_CMD_SETEXPR
 
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 f439413..a8a3ba4 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -51,9 +51,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
@@ -244,9 +241,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 e9088a2..7ed2d1c 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
@@ -77,9 +72,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
-- 
2.4.1

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 08/10] imx6: standardise filesystem and boot options
  2015-05-22 16:30 ` [U-Boot] [PATCH 08/10] imx6: standardise filesystem and boot options Peter Robinson
@ 2015-05-22 18:48   ` Soeren Moch
  2015-05-22 23:06     ` Peter Robinson
  0 siblings, 1 reply; 27+ messages in thread
From: Soeren Moch @ 2015-05-22 18:48 UTC (permalink / raw)
  To: u-boot

> Move all standard filesystem, partition and fdt options to mx6_common.
>
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com  <http://lists.denx.de/mailman/listinfo/u-boot>>

[...]

> diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
> index 07fc3e8..c323038 100644
> --- a/include/configs/mx6_common.h
> +++ b/include/configs/mx6_common.h
> @@ -67,6 +67,17 @@
>  #define CONFIG_CONS_INDEX       1
>  #define CONFIG_BAUDRATE         115200
>
> +/* Filesystems and image support */
> +#define CONFIG_OF_LIBFDT
> +#define CONFIG_CMD_BOOTZ
> +#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


Peter,

Thanks for fixing EFI_PARTITION in tbs2910.

You still define CONFIG_CMD_EXT2 and CONFIG_CMD_EXT4, while
only CONFIG_CMD_EXT4 is required. That is not really a problem,
but since you are doing cleanup here...

Regards,
Soeren

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 08/10] imx6: standardise filesystem and boot options
  2015-05-22 18:48   ` Soeren Moch
@ 2015-05-22 23:06     ` Peter Robinson
  2015-05-23  4:35       ` Soeren Moch
  0 siblings, 1 reply; 27+ messages in thread
From: Peter Robinson @ 2015-05-22 23:06 UTC (permalink / raw)
  To: u-boot

On 22 May 2015 19:48, "Soeren Moch" <smoch@web.de> wrote:
>>
>> Move all standard filesystem, partition and fdt options to mx6_common.
>>
>> Signed-off-by: Peter Robinson <pbrobinson@gmail.com  <
http://lists.denx.de/mailman/listinfo/u-boot>>
>
>
> [...]
>
>
>> diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
>> index 07fc3e8..c323038 100644
>> --- a/include/configs/mx6_common.h
>> +++ b/include/configs/mx6_common.h
>> @@ -67,6 +67,17 @@
>>  #define CONFIG_CONS_INDEX       1
>>  #define CONFIG_BAUDRATE         115200
>>
>> +/* Filesystems and image support */
>> +#define CONFIG_OF_LIBFDT
>> +#define CONFIG_CMD_BOOTZ
>> +#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
>
>
>
> Peter,
>
> Thanks for fixing EFI_PARTITION in tbs2910.
>
> You still define CONFIG_CMD_EXT2 and CONFIG_CMD_EXT4, while
> only CONFIG_CMD_EXT4 is required. That is not really a problem,
> but since you are doing cleanup here...
>

Yes, i looked at this and a good half were including ext2. I plan on doing
another pass so I figure there's enough churn already in this series so get
it merged and ensure there's no regression and then re-review.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 08/10] imx6: standardise filesystem and boot options
  2015-05-22 23:06     ` Peter Robinson
@ 2015-05-23  4:35       ` Soeren Moch
  0 siblings, 0 replies; 27+ messages in thread
From: Soeren Moch @ 2015-05-23  4:35 UTC (permalink / raw)
  To: u-boot



On 23.05.2015 01:06, Peter Robinson wrote:
> 
> On 22 May 2015 19:48, "Soeren Moch" <smoch at web.de <mailto:smoch@web.de>>
> wrote:
>>>
>>> Move all standard filesystem, partition and fdt options to mx6_common.
>>>
>>> Signed-off-by: Peter Robinson <pbrobinson@gmail.com
> <http://gmail.com>  <http://lists.denx.de/mailman/listinfo/u-boot>>
>>
>>
>> [...]
>>
>>
>>> diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
>>> index 07fc3e8..c323038 100644
>>> --- a/include/configs/mx6_common.h
>>> +++ b/include/configs/mx6_common.h
>>> @@ -67,6 +67,17 @@
>>>  #define CONFIG_CONS_INDEX       1
>>>  #define CONFIG_BAUDRATE         115200
>>>
>>> +/* Filesystems and image support */
>>> +#define CONFIG_OF_LIBFDT
>>> +#define CONFIG_CMD_BOOTZ
>>> +#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
>>
>>
>>
>> Peter,
>>
>> Thanks for fixing EFI_PARTITION in tbs2910.
>>
>> You still define CONFIG_CMD_EXT2 and CONFIG_CMD_EXT4, while
>> only CONFIG_CMD_EXT4 is required. That is not really a problem,
>> but since you are doing cleanup here...
>>
> 
> Yes, i looked at this and a good half were including ext2. I plan on
> doing another pass so I figure there's enough churn already in this
> series so get it merged and ensure there's no regression and then
> re-review.
> 

Ah ok, if you want to run ext2ls / ext2load you need CONFIG_CMD_EXT2
explicitly. I thought that this would also be enabled by CONFIG_CMD_EXT4
automatically.

Sorry for the noise,
 Soeren

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 09/10] imx6: generic MMC config options to mx6_common
  2015-05-22 16:30 [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config Peter Robinson
                   ` (7 preceding siblings ...)
  2015-05-22 16:30 ` [U-Boot] [PATCH 08/10] imx6: standardise filesystem and boot options Peter Robinson
@ 2015-05-22 16:30 ` Peter Robinson
  2015-05-22 16:30 ` [U-Boot] [PATCH 10/10] mx6: standardise CONFIG_CMD_CACHE Peter Robinson
  2015-05-26 12:11 ` [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config Stefano Babic
  10 siblings, 0 replies; 27+ messages in thread
From: Peter Robinson @ 2015-05-22 16:30 UTC (permalink / raw)
  To: u-boot

Move all standard mx6 MMC configs to mx6_common.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.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/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 -------
 22 files changed, 8 insertions(+), 142 deletions(-)

diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
index 920e876..36d049d 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 663e04b..a3908d0 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -25,11 +25,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 d2fb979..d52808f 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -56,15 +56,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 215c92c..f6021df 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -117,14 +117,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/mx6_common.h b/include/configs/mx6_common.h
index c323038..c9cd648 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -93,4 +93,12 @@
 #define CONFIG_MXC_GPIO
 #define CONFIG_CMD_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 e9af5d1..e44a5be 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 0abe38f..917563b 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 c260d92..668d939 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 b8ba9f9..6d3bbc2 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 01cd0f6..5e04fa0 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -60,16 +60,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_SUPPORT_EMMC_BOOT
-#define CONFIG_BOUNCE_BUFFER
 
 /* Ethernet */
 #define CONFIG_FEC_MXC
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index f3d11fa..992d55a 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 13ce4ab..e144f83 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 a8a3ba4..37b5357 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -42,16 +42,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 7ed2d1c..3b3bc2a 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
-- 
2.4.1

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 10/10] mx6: standardise CONFIG_CMD_CACHE
  2015-05-22 16:30 [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config Peter Robinson
                   ` (8 preceding siblings ...)
  2015-05-22 16:30 ` [U-Boot] [PATCH 09/10] imx6: generic MMC config options to mx6_common Peter Robinson
@ 2015-05-22 16:30 ` Peter Robinson
  2015-05-26 12:11 ` [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config Stefano Babic
  10 siblings, 0 replies; 27+ messages in thread
From: Peter Robinson @ 2015-05-22 16:30 UTC (permalink / raw)
  To: u-boot

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

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
 include/configs/aristainetos.h    | 2 --
 include/configs/cgtqmx6eval.h     | 4 ----
 include/configs/embestmx6boards.h | 4 ----
 include/configs/gw_ventana.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 ----
 20 files changed, 4 insertions(+), 69 deletions(-)

diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
index 36d049d..5e57cca 100644
--- a/include/configs/aristainetos.h
+++ b/include/configs/aristainetos.h
@@ -204,8 +204,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 d52808f..cb81e63 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -131,10 +131,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 f6021df..f59cb83 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -456,8 +456,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/mx6_common.h b/include/configs/mx6_common.h
index c9cd648..233c6d2 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -89,6 +89,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
 #define CONFIG_CMD_GPIO
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index e44a5be..c0f7f8b 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -203,6 +203,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 917563b..6a37ae7 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -196,10 +196,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 668d939..9313b9f 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -320,10 +320,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 6d3bbc2..5ab22e7 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 5e04fa0..13a6e06 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -175,10 +175,6 @@
 #define CONFIG_MXC_OCOTP
 #endif
 
-#ifndef CONFIG_SYS_DCACHE_OFF
-#define CONFIG_CMD_CACHE
-#endif
-
 /* 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 992d55a..7490fa8 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 e144f83..4c93c9b 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -393,10 +393,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 37b5357..69590ad 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -234,8 +234,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 3b3bc2a..2673948 100644
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -65,10 +65,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
-- 
2.4.1

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config
  2015-05-22 16:30 [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config Peter Robinson
                   ` (9 preceding siblings ...)
  2015-05-22 16:30 ` [U-Boot] [PATCH 10/10] mx6: standardise CONFIG_CMD_CACHE Peter Robinson
@ 2015-05-26 12:11 ` Stefano Babic
  2015-05-26 13:23   ` Peter Robinson
  10 siblings, 1 reply; 27+ messages in thread
From: Stefano Babic @ 2015-05-26 12:11 UTC (permalink / raw)
  To: u-boot

Hi Peter,

On 22/05/2015 18:30, Peter Robinson wrote:
> There's a lot of common options in the i.MX6 boards that are repeated across a
> lot of the devices. There's a mx6_common.h which is little used but makes sense
> to be the central location for all the options we want across all mx6 boards to
> ensure a consistent set of features. This is a first pass at moving those options
> and unifying the common options to a standard default.
> 
> Changes since v2:
> * Rebase on imx-uboot master
> * Check that CONFIG_MX6 hasn't already been defined
> * Check that CONFIG_SYS_TEXT_BASE/CONFIG_BOOTDELAY haven't already been defined
> * Don't accidentily drop CONFIG_EFI_PARTITION from tbs2910.h
> 
> Changes since v1:
> * Move CONFIG_SYS_NO_FLASH changes from patch 7 to patch 2 and reorder includes
> so we don't need to undef CONFIG_CMD_FLASH / CONFIG_CMD_IMLS
> * Add CONFIG_CMD_GPIO to mx6_common.f (patch 5)
> * Use the default for all CONFIG_SYS_PROMPT_HUSH_PS2 (patch 7)
> * Drop LZO change (patch 8)
> 
> Peter Robinson (10):
>       novena: standardise mx6_common.h include
>       imx6: move all standard includes to mx6_common.h
>       imx6: move generic imx6 options to mx6_common.h
>       imx6: move standard ATAG configs to mx6_common.h
>       imx6: move MXC_GPIO define to mx6_common.h
>       imx6: centralise common boot options in mx6_common.h
>       imx6: move generic miscellaneous and overwrite options
>       imx6: standardise filesystem and boot options
>       imx6: generic MMC config options to mx6_common
>       mx6: standardise CONFIG_CMD_CACHE
> 
> Reviewed-by: Eric Nelson <eric.nelson@boundarydevices.com>
> 

There are still a couple of issues applying the patchset. The solidrun
mx6cuboxi is broken, and building mars and riot boards report warnings
due to duplicated BOOT_DELAY - rather config_distro has no protection if
BOOT_DELAY is already set.

I can fix all these issues with the following changes:

diff --git a/include/configs/embestmx6boards.h
b/include/configs/embestmx6boards.h
index cb81e63..56950e0 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -13,8 +13,6 @@
 #ifndef __RIOTBOARD_CONFIG_H
 #define __RIOTBOARD_CONFIG_H

-#include "mx6_common.h"
-
 #define CONFIG_MXC_UART_BASE		UART2_BASE
 #define CONFIG_CONSOLE_DEV		"ttymxc1"
 #define CONFIG_MMCROOT			"/dev/mmcblk1p2"
@@ -149,6 +147,7 @@
 #define CONFIG_IMX_VIDEO_SKIP

 #include <config_distro_defaults.h>
+#include "mx6_common.h"

 /* 256M RAM (minimum), 32M uncompressed kernel, 16M compressed kernel,
1M fdt,
  * 1M script, 1M pxe and the ramdisk at the end */
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index c0f7f8b..3204191 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -192,12 +192,21 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE              256
-#define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

 #define CONFIG_CMDLINE_EDITING

+/* Physical Memory Map */
+#define CONFIG_NR_DRAM_BANKS           1
+#define CONFIG_SYS_SDRAM_BASE          MMDC0_ARB_BASE_ADDR
+#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CONFIG_SYS_INIT_SP_OFFSET \
+	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_SP_ADDR \
+	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
+
+
 /* Environment organization */
 #define CONFIG_ENV_SIZE			(8 * 1024)
 #define CONFIG_ENV_IS_IN_MMC


If nobody complains, I can apply your patchset introducing theses fixes.
Or would you send a V3 that fixes them, too ?

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
-------------- next part --------------
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index cb81e63..56950e0 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -13,8 +13,6 @@
 #ifndef __RIOTBOARD_CONFIG_H
 #define __RIOTBOARD_CONFIG_H
 
-#include "mx6_common.h"
-
 #define CONFIG_MXC_UART_BASE		UART2_BASE
 #define CONFIG_CONSOLE_DEV		"ttymxc1"
 #define CONFIG_MMCROOT			"/dev/mmcblk1p2"
@@ -149,6 +147,7 @@
 #define CONFIG_IMX_VIDEO_SKIP
 
 #include <config_distro_defaults.h>
+#include "mx6_common.h"
 
 /* 256M RAM (minimum), 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
  * 1M script, 1M pxe and the ramdisk at the end */
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index c0f7f8b..3204191 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -192,12 +192,21 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE              256
-#define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
 
 #define CONFIG_CMDLINE_EDITING
 
+/* Physical Memory Map */
+#define CONFIG_NR_DRAM_BANKS           1
+#define CONFIG_SYS_SDRAM_BASE          MMDC0_ARB_BASE_ADDR
+#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
+#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CONFIG_SYS_INIT_SP_OFFSET \
+	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_SP_ADDR \
+	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
+
+
 /* Environment organization */
 #define CONFIG_ENV_SIZE			(8 * 1024)
 #define CONFIG_ENV_IS_IN_MMC

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config
  2015-05-26 12:11 ` [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config Stefano Babic
@ 2015-05-26 13:23   ` Peter Robinson
  2015-05-26 14:06     ` Stefano Babic
  0 siblings, 1 reply; 27+ messages in thread
From: Peter Robinson @ 2015-05-26 13:23 UTC (permalink / raw)
  To: u-boot

Hi Stefano,

> On 22/05/2015 18:30, Peter Robinson wrote:
>> There's a lot of common options in the i.MX6 boards that are repeated across a
>> lot of the devices. There's a mx6_common.h which is little used but makes sense
>> to be the central location for all the options we want across all mx6 boards to
>> ensure a consistent set of features. This is a first pass at moving those options
>> and unifying the common options to a standard default.
>>
>> Changes since v2:
>> * Rebase on imx-uboot master
>> * Check that CONFIG_MX6 hasn't already been defined
>> * Check that CONFIG_SYS_TEXT_BASE/CONFIG_BOOTDELAY haven't already been defined
>> * Don't accidentily drop CONFIG_EFI_PARTITION from tbs2910.h
>>
>> Changes since v1:
>> * Move CONFIG_SYS_NO_FLASH changes from patch 7 to patch 2 and reorder includes
>> so we don't need to undef CONFIG_CMD_FLASH / CONFIG_CMD_IMLS
>> * Add CONFIG_CMD_GPIO to mx6_common.f (patch 5)
>> * Use the default for all CONFIG_SYS_PROMPT_HUSH_PS2 (patch 7)
>> * Drop LZO change (patch 8)
>>
>> Peter Robinson (10):
>>       novena: standardise mx6_common.h include
>>       imx6: move all standard includes to mx6_common.h
>>       imx6: move generic imx6 options to mx6_common.h
>>       imx6: move standard ATAG configs to mx6_common.h
>>       imx6: move MXC_GPIO define to mx6_common.h
>>       imx6: centralise common boot options in mx6_common.h
>>       imx6: move generic miscellaneous and overwrite options
>>       imx6: standardise filesystem and boot options
>>       imx6: generic MMC config options to mx6_common
>>       mx6: standardise CONFIG_CMD_CACHE
>>
>> Reviewed-by: Eric Nelson <eric.nelson@boundarydevices.com>
>>
>
> There are still a couple of issues applying the patchset. The solidrun
> mx6cuboxi is broken, and building mars and riot boards report warnings
> due to duplicated BOOT_DELAY - rather config_distro has no protection if
> BOOT_DELAY is already set.
>
> I can fix all these issues with the following changes:
>
> diff --git a/include/configs/embestmx6boards.h
> b/include/configs/embestmx6boards.h
> index cb81e63..56950e0 100644
> --- a/include/configs/embestmx6boards.h
> +++ b/include/configs/embestmx6boards.h
> @@ -13,8 +13,6 @@
>  #ifndef __RIOTBOARD_CONFIG_H
>  #define __RIOTBOARD_CONFIG_H
>
> -#include "mx6_common.h"
> -
>  #define CONFIG_MXC_UART_BASE           UART2_BASE
>  #define CONFIG_CONSOLE_DEV             "ttymxc1"
>  #define CONFIG_MMCROOT                 "/dev/mmcblk1p2"
> @@ -149,6 +147,7 @@
>  #define CONFIG_IMX_VIDEO_SKIP
>
>  #include <config_distro_defaults.h>
> +#include "mx6_common.h"
>
>  /* 256M RAM (minimum), 32M uncompressed kernel, 16M compressed kernel,
> 1M fdt,
>   * 1M script, 1M pxe and the ramdisk at the end */
> diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
> index c0f7f8b..3204191 100644
> --- a/include/configs/mx6cuboxi.h
> +++ b/include/configs/mx6cuboxi.h
> @@ -192,12 +192,21 @@
>  #define CONFIG_SYS_LONGHELP
>  #define CONFIG_SYS_HUSH_PARSER
>  #define CONFIG_AUTO_COMPLETE
> -#define CONFIG_SYS_CBSIZE              256
> -#define CONFIG_SYS_MAXARGS             16
>  #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
>
>  #define CONFIG_CMDLINE_EDITING
>
> +/* Physical Memory Map */
> +#define CONFIG_NR_DRAM_BANKS           1
> +#define CONFIG_SYS_SDRAM_BASE          MMDC0_ARB_BASE_ADDR
> +#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
> +#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
> +#define CONFIG_SYS_INIT_SP_OFFSET \
> +       (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
> +#define CONFIG_SYS_INIT_SP_ADDR \
> +       (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
> +
> +
>  /* Environment organization */
>  #define CONFIG_ENV_SIZE                        (8 * 1024)
>  #define CONFIG_ENV_IS_IN_MMC
>
>
> If nobody complains, I can apply your patchset introducing theses fixes.

Please do, getting them applied so we can move forward would be great.

Peter

> Or would you send a V3 that fixes them, too ?
>
> Best regards,
> Stefano Babic
>
> --
> =====================================================================
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
> =====================================================================

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config
  2015-05-26 13:23   ` Peter Robinson
@ 2015-05-26 14:06     ` Stefano Babic
  2015-05-27  1:45       ` Fabio Estevam
  0 siblings, 1 reply; 27+ messages in thread
From: Stefano Babic @ 2015-05-26 14:06 UTC (permalink / raw)
  To: u-boot

Hi Peter, Heiko,

On 26/05/2015 15:23, Peter Robinson wrote:
> 
> Please do, getting them applied so we can move forward would be great.
> 

Ok, all boards compile fine now - I have pushed all changes.

Heiko, there are several chqanges for the aristainetos board, because
Peter's patches do not apply due to recent merge of aristainetos2 (and
moving to aristainetos-common.h). I hope I did correctly without missing
anything, but please take a look and check if it is ok for you.

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config
  2015-05-26 14:06     ` Stefano Babic
@ 2015-05-27  1:45       ` Fabio Estevam
  2015-05-27  2:08         ` Fabio Estevam
  0 siblings, 1 reply; 27+ messages in thread
From: Fabio Estevam @ 2015-05-27  1:45 UTC (permalink / raw)
  To: u-boot

On Tue, May 26, 2015 at 11:06 AM, Stefano Babic <sbabic@denx.de> wrote:
> Hi Peter, Heiko,
>
> On 26/05/2015 15:23, Peter Robinson wrote:
>>
>> Please do, getting them applied so we can move forward would be great.
>>
>
> Ok, all boards compile fine now - I have pushed all changes.

I noticed that this series broke warp board and the board does not boot anymore.

Reverting this series I am able to boot it again.

Will investigate more tomorrow.

Regards,

Fabio Estevam

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config
  2015-05-27  1:45       ` Fabio Estevam
@ 2015-05-27  2:08         ` Fabio Estevam
  2015-05-27  6:26           ` Stefano Babic
  0 siblings, 1 reply; 27+ messages in thread
From: Fabio Estevam @ 2015-05-27  2:08 UTC (permalink / raw)
  To: u-boot

On Tue, May 26, 2015 at 10:45 PM, Fabio Estevam <festevam@gmail.com> wrote:
> On Tue, May 26, 2015 at 11:06 AM, Stefano Babic <sbabic@denx.de> wrote:
>> Hi Peter, Heiko,
>>
>> On 26/05/2015 15:23, Peter Robinson wrote:
>>>
>>> Please do, getting them applied so we can move forward would be great.
>>>
>>
>> Ok, all boards compile fine now - I have pushed all changes.
>
> I noticed that this series broke warp board and the board does not boot anymore.
>
> Reverting this series I am able to boot it again.

Ok, so the problem is commit 8183058188c ("imx6: centralise common
boot options in mx6_common.h"), as it changes all mx6 SoCs to use
CONFIG_LOADADDR=0x12000000, but this is not correct for mx6sx and
mx6sl that should use 0x82000000 instead.

Regards,

Fabio Estevam

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config
  2015-05-27  2:08         ` Fabio Estevam
@ 2015-05-27  6:26           ` Stefano Babic
  0 siblings, 0 replies; 27+ messages in thread
From: Stefano Babic @ 2015-05-27  6:26 UTC (permalink / raw)
  To: u-boot

Hi Fabio,

On 27/05/2015 04:08, Fabio Estevam wrote:
> On Tue, May 26, 2015 at 10:45 PM, Fabio Estevam <festevam@gmail.com> wrote:
>> On Tue, May 26, 2015 at 11:06 AM, Stefano Babic <sbabic@denx.de> wrote:
>>> Hi Peter, Heiko,
>>>
>>> On 26/05/2015 15:23, Peter Robinson wrote:
>>>>
>>>> Please do, getting them applied so we can move forward would be great.
>>>>
>>>
>>> Ok, all boards compile fine now - I have pushed all changes.
>>
>> I noticed that this series broke warp board and the board does not boot anymore.
>>
>> Reverting this series I am able to boot it again.
> 
> Ok, so the problem is commit 8183058188c ("imx6: centralise common
> boot options in mx6_common.h"), as it changes all mx6 SoCs to use
> CONFIG_LOADADDR=0x12000000, but this is not correct for mx6sx and
> mx6sl that should use 0x82000000 instead.
> 

urgh...thanks to have solved this, I will pick up your patches soon.

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 0/10 v2] i.MX6: move duplicated options to mx6_common to standardise mx6 config
@ 2015-05-11 16:22 Peter Robinson
  2015-05-11 16:22 ` [U-Boot] [PATCH 08/10] imx6: standardise filesystem and boot options Peter Robinson
  0 siblings, 1 reply; 27+ messages in thread
From: Peter Robinson @ 2015-05-11 16:22 UTC (permalink / raw)
  To: u-boot

There's a lot of common options in the i.MX6 boards that are repeated across a 
lot of the devices. There's a mx6_common.h which is little used but makes sense
to be the central location for all the options we want across all mx6 boards to
ensure a consistent set of features. This is a first pass at moving those options
and unifying the common options to a standard default.

Changes since v1:
* Move CONFIG_SYS_NO_FLASH changes from patch 7 to patch 2 and reorder includes
so we don't need to undef CONFIG_CMD_FLASH / CONFIG_CMD_IMLS
* Add CONFIG_CMD_GPIO to mx6_common.f (patch 5)
* Use the default for all CONFIG_SYS_PROMPT_HUSH_PS2 (patch 7)
* Drop LZO change (patch 8) 

I think I got all the review points :)

Peter Robinson (10):
      novena: standardise mx6_common.h include
      imx6: move all standard includes to mx6_common.h
      imx6: move generic imx6 options to mx6_common.h
      imx6: move standard ATAG configs to mx6_common.h
      imx6: move MXC_GPIO define to mx6_common.h
      imx6: centralise common boot options in mx6_common.h
      imx6: move generic miscellaneous and overwrite options
      imx6: standardise filesystem and boot options
      imx6: generic MMC config options to mx6_common
      mx6: standardise CONFIG_CMD_CACHE

Reviewed-by: Eric Nelson <eric.nelson@boundarydevices.com>

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 08/10] imx6: standardise filesystem and boot options
  2015-05-11 16:22 [U-Boot] [PATCH 0/10 v2] " Peter Robinson
@ 2015-05-11 16:22 ` Peter Robinson
  2015-05-11 17:21   ` Soeren Moch
  0 siblings, 1 reply; 27+ messages in thread
From: Peter Robinson @ 2015-05-11 16:22 UTC (permalink / raw)
  To: u-boot

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

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
 include/configs/aristainetos.h    |  9 +--------
 include/configs/cgtqmx6eval.h     |  6 ------
 include/configs/gw_ventana.h      |  9 +--------
 include/configs/hummingboard.h    |  6 ------
 include/configs/mx6_common.h      | 11 +++++++++++
 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        |  6 ------
 include/configs/secomx6quq7.h     |  6 ------
 include/configs/tbs2910.h         |  9 ---------
 include/configs/titanium.h        |  7 -------
 include/configs/tqma6.h           |  6 ------
 include/configs/udoo.h            |  6 ------
 include/configs/wandboard.h       |  6 ------
 include/configs/warp.h            |  8 --------
 21 files changed, 13 insertions(+), 147 deletions(-)

diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
index bd93db2..920e876 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 \
@@ -215,8 +211,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
@@ -253,7 +247,6 @@
 
 /* USB Configs */
 #define CONFIG_CMD_USB
-#define CONFIG_CMD_FAT
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_STORAGE
@@ -266,11 +259,11 @@
 #define ARISTAINETOS_USB_H1_PWR		IMX_GPIO_NR(3, 31)
 
 /* UBI support */
+#define CONFIG_LZO
 #define CONFIG_CMD_MTDPARTS
 #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..c12edc8 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
@@ -245,6 +238,7 @@
 /*
  * MTD Command for mtdparts
  */
+#define CONFIG_LZO
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
@@ -436,7 +430,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 fbc5421..fe6b2f9 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -60,6 +60,17 @@
 #define CONFIG_CONS_INDEX       1
 #define CONFIG_BAUDRATE         115200
 
+/* Filesystems and image support */
+#define CONFIG_OF_LIBFDT
+#define CONFIG_CMD_BOOTZ
+#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 f7e69d7..0abe38f 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
@@ -209,8 +203,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 62d4dd9..c260d92 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
@@ -333,9 +327,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
@@ -346,10 +337,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 c4ca7b9..b8ba9f9 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
@@ -142,9 +139,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))
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 18cacb1..70fce6a 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 dc875b5..f3d11fa 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
@@ -220,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 799853c..bea9752 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
 
@@ -400,7 +395,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 e9088a2..7ed2d1c 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
@@ -77,9 +72,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
-- 
2.4.0

^ permalink raw reply related	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 08/10] imx6: standardise filesystem and boot options
  2015-05-11 16:22 ` [U-Boot] [PATCH 08/10] imx6: standardise filesystem and boot options Peter Robinson
@ 2015-05-11 17:21   ` Soeren Moch
  2015-05-11 17:55     ` Soeren Moch
  0 siblings, 1 reply; 27+ messages in thread
From: Soeren Moch @ 2015-05-11 17:21 UTC (permalink / raw)
  To: u-boot

[...]

 > 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/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
 >

Peter,

you removed CONFIG_EFI_PARTITION from tbs2910.h without adding it to mx6_common.h .
Please fix this in your next version of the patch series.

Thanks,
Soeren

^ permalink raw reply	[flat|nested] 27+ messages in thread

* [U-Boot] [PATCH 08/10] imx6: standardise filesystem and boot options
  2015-05-11 17:21   ` Soeren Moch
@ 2015-05-11 17:55     ` Soeren Moch
  0 siblings, 0 replies; 27+ messages in thread
From: Soeren Moch @ 2015-05-11 17:55 UTC (permalink / raw)
  To: u-boot

On 05/11/15 19:21, Soeren Moch wrote:
> [...]
>
> > 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_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/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
> >
>
> Peter,
>
> you removed CONFIG_EFI_PARTITION from tbs2910.h without adding it to mx6_common.h .
> Please fix this in your next version of the patch series.
>
> Thanks,
> Soeren
>
One additional comment:
Do we really need CONFIG_CMD_EXT2 when CONFIG_CMD_EXT4 is defined? My understanding
was so far, that CONFIG_CMD_EXT4 alone is enough.

Regards,
Soeren

^ permalink raw reply	[flat|nested] 27+ messages in thread

end of thread, other threads:[~2015-05-29 18:02 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-22 16:30 [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config Peter Robinson
2015-05-22 16:30 ` [U-Boot] [PATCH 01/10] novena: standardise mx6_common.h include Peter Robinson
2015-05-22 16:30 ` [U-Boot] [PATCH 02/10] imx6: move all standard includes to mx6_common.h Peter Robinson
2015-05-22 16:30 ` [U-Boot] [PATCH 03/10] imx6: move generic imx6 options " Peter Robinson
2015-05-22 18:18   ` Soeren Moch
2015-05-26 11:39     ` Stefano Babic
2015-05-26 12:10       ` Soeren Moch
2015-05-29 18:02         ` Soeren Moch
2015-05-22 16:30 ` [U-Boot] [PATCH 04/10] imx6: move standard ATAG configs " Peter Robinson
2015-05-22 16:30 ` [U-Boot] [PATCH 05/10] imx6: move MXC_GPIO define " Peter Robinson
2015-05-22 16:30 ` [U-Boot] [PATCH 06/10] imx6: centralise common boot options in mx6_common.h Peter Robinson
2015-05-22 16:30 ` [U-Boot] [PATCH 07/10] imx6: move generic miscellaneous and overwrite options Peter Robinson
2015-05-22 16:30 ` [U-Boot] [PATCH 08/10] imx6: standardise filesystem and boot options Peter Robinson
2015-05-22 18:48   ` Soeren Moch
2015-05-22 23:06     ` Peter Robinson
2015-05-23  4:35       ` Soeren Moch
2015-05-22 16:30 ` [U-Boot] [PATCH 09/10] imx6: generic MMC config options to mx6_common Peter Robinson
2015-05-22 16:30 ` [U-Boot] [PATCH 10/10] mx6: standardise CONFIG_CMD_CACHE Peter Robinson
2015-05-26 12:11 ` [U-Boot] [PATCH 0/10 v3] i.MX6: move duplicated options to mx6_common to standardise mx6 config Stefano Babic
2015-05-26 13:23   ` Peter Robinson
2015-05-26 14:06     ` Stefano Babic
2015-05-27  1:45       ` Fabio Estevam
2015-05-27  2:08         ` Fabio Estevam
2015-05-27  6:26           ` Stefano Babic
  -- strict thread matches above, loose matches on Subject: below --
2015-05-11 16:22 [U-Boot] [PATCH 0/10 v2] " Peter Robinson
2015-05-11 16:22 ` [U-Boot] [PATCH 08/10] imx6: standardise filesystem and boot options Peter Robinson
2015-05-11 17:21   ` Soeren Moch
2015-05-11 17:55     ` Soeren Moch

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.