mx6: standardise CONFIG_CMD_CACHE

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 at konsulko.com>

diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index d44624d68b04e4c9b6a0da1b31da1ee3d50ffcd2..1abaabf7e39129647ee26f343d278c070b535913 100644 (file)
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -193,8 +193,6 @@
 #define CONFIG_ENV_OFFSET              (0x0d0000)
 #define CONFIG_ENV_OFFSET_REDUND       (0x0e0000)
 
-#define CONFIG_CMD_CACHE
-
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 
 /* I2C */

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index d655baaeeb8dc7cbc52bc5dd4f103ec18d313363..dd06c05b8e05b6439b11e96f7f79693fedc94a4a 100644 (file)
--- 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 23df69faa8dad4ac9880bdd7f3c4fe6ee425ca36..6df2db3df0805292d86e771e4104137c32909e8b 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -129,10 +129,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 42880960fb70a500026ca3c3cc4a1b4f3ec4b23f..406bf2e53d4a0e82e5f7b20bcb07f65dacfc207f 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -457,8 +457,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 626af41be369c933573c8c05fabbf15a3f28b428..50d7038fad00ca43b39c8023e707aead2f940137 100644 (file)
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -91,6 +91,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 3c0affe1e346318b130117607d7f776c7466d963..21c3f960aef391f9604f803dad73ad8d4468fedc 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -212,6 +212,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 961a3a5685b810b2e8c181fdbb87dad616352786..202ea352791f4b766d9ff6985a475943806d4bbe 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -219,10 +219,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 455e4b03da5baf7db8e327e7dc562a6631c32ad1..8fc3a1fe6555b7fc488085823678e3f724e84d07 100644 (file)
--- 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 d39f954ab251c978793785bd59ee1919c256adc5..3a9239e30679a154171a94c532ab25c54fa55401 100644 (file)
--- 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 121cbefd44cab5091599f41fb6e09d5d3a551ccc..d1c6f5762d8cf8303ff1524e52c3966aaa3fbb29 100644 (file)
--- 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 b6e852167a60487307558cff06abf36abc6b2903..1f9326961c11c45954f0ae504482d0aafde32f0c 100644 (file)
--- 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 3d9b04f7b550e6da99856a6e1607d2353572a5f8..5f7fb669a2bf30df6339d3d486fcd230a1332f98 100644 (file)
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -154,10 +154,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 6d3bbc28d3db6a6b86b4d76b37eb1f6dca9ca8d2..5ab22e7d5f6b1df4a1839469fc0cd642a6dc5eae 100644 (file)
--- 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 7b28671e182a4bf08c686b012f52aa733daaa669..72b13a63ac2e78710f6399c55c0de3f3eef89d8c 100644 (file)
--- 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 5e04fa01f4e9322e52a4b4a1d23a63ff92d4c443..13a6e06b5d6c87a79ccbd9bff4aad1a675e7e88d 100644 (file)
--- 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 3fe5abd7160f9f570c6da2e5bd552c7b7a62b802..5afa6a27e1b40024ecb0f7601faa9a79f7afa9b8 100644 (file)
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -207,8 +207,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 c5a404af8d4c149d9bf11f35c9d08a2418e95db9..8008f3de03ca5897141d66d7c6b6800903b00b4b 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -389,10 +389,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 84c36069c93c84a8f67e1eefe432377544a22a83..fce2b9b3e66bddaed52188e9d0014368dc607829 100644 (file)
--- 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 d827e3bef213878d94827b0e06850709ce9de8c0..04d6abf5801d8c3ce79cd2266809d0f63b7f471d 100644 (file)
--- 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 3b3bc2a7a5622f7abfa51ea2f54960951a5d8965..26739489551762602d92c5f9026ab81bec16a3c7 100644 (file)
--- 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