From 1022b85cb0e143b4f3a8e6c7d9258d516920d464 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 22 May 2015 17:30:53 +0100 Subject: [PATCH] mx6: standardise CONFIG_CMD_CACHE Move CONFIG_CMD_CACHE to mx6_common and standardise the way it's defined. Signed-off-by: Peter Robinson Reviewed-by: Tom Rini --- include/configs/aristainetos-common.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-common.h b/include/configs/aristainetos-common.h index d44624d68b..1abaabf7e3 100644 --- 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 d655baaeeb..dd06c05b8e 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 97a2fb1d73..56950e05db 100644 --- 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 42880960fb..406bf2e53d 100644 --- 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 c9cd648a1e..233c6d2e88 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 3c0affe1e3..21c3f960ae 100644 --- 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 917563b621..6a37ae7384 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 c613a2b18f..2b8bb2a50d 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 8e98c8e168..46e126276c 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 668d939779..9313b9ff3d 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 b6e852167a..1f9326961c 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 71658770fe..699b037b94 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 6d3bbc28d3..5ab22e7d5f 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 7b28671e18..72b13a63ac 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 5e04fa01f4..13a6e06b5d 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 992d55aaf2..7490fa8bed 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 e144f83f95..4c93c9bbb9 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 84c36069c9..fce2b9b3e6 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 37b5357adb..69590ad884 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 3b3bc2a7a5..2673948955 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.39.5