From e51c1e8eced7f1661994bd3e1caf0ca032455b3e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 22 May 2015 17:30:52 +0100 Subject: imx6: generic MMC config options to mx6_common Move all standard mx6 MMC configs to mx6_common. Signed-off-by: Peter Robinson Reviewed-by: Tom Rini diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index d84a908..d44624d 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -30,15 +30,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..97a2fb1 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" @@ -56,15 +54,8 @@ #define CONFIG_MXC_USB_FLAGS 0 /* MMC Configs */ -#define CONFIG_FSL_ESDHC -#define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_BOUNCE_BUFFER - #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR @@ -160,6 +151,7 @@ #define CONFIG_IMX_VIDEO_SKIP #include +#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/gw_ventana.h b/include/configs/gw_ventana.h index 1b4078c..4288096 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 60c3ac9..3c0affe 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 -- cgit v0.10.2