From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bo Shen Date: Mon, 19 Jan 2015 16:30:17 +0800 Subject: [U-Boot] [PATCH] ARM: at91: mmc portA support is only for at91sam9g20ek_2mmc board In-Reply-To: <1421652356-5267-1-git-send-email-josh.wu@atmel.com> References: <1421652356-5267-1-git-send-email-josh.wu@atmel.com> Message-ID: <54BCC099.3060607@atmel.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Josh, On 01/19/2015 03:25 PM, Josh Wu wrote: > Current the MMC support will enable MCI port A, Which is only exist > for 2mmc board. > So by default we need to disable MMC (port A) support. And only enable > it for 2mmc board. Otherwise, dataflash won't work in at91sam9260ek board > as MMC has confliction with Dataflash in the CLK pin. > > Signed-off-by: Josh Wu > --- > > configs/at91sam9g20ek_2mmc_defconfig | 3 +++ > configs/at91sam9g20ek_mmc_defconfig | 3 --- > include/configs/at91sam9260ek.h | 6 ++++-- > 3 files changed, 7 insertions(+), 5 deletions(-) > create mode 100644 configs/at91sam9g20ek_2mmc_defconfig > delete mode 100644 configs/at91sam9g20ek_mmc_defconfig > > diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig > new file mode 100644 > index 0000000..4eef04f > --- /dev/null > +++ b/configs/at91sam9g20ek_2mmc_defconfig > @@ -0,0 +1,3 @@ > +CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_MMC" > +CONFIG_ARM=y > +CONFIG_TARGET_AT91SAM9260EK=y > diff --git a/configs/at91sam9g20ek_mmc_defconfig b/configs/at91sam9g20ek_mmc_defconfig > deleted file mode 100644 > index 8cca2e5..0000000 > --- a/configs/at91sam9g20ek_mmc_defconfig > +++ /dev/null If removed this default configuration file, we can not use mmc at all, am I right? > @@ -1,3 +0,0 @@ > -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_MMC" > -CONFIG_ARM=y > -CONFIG_TARGET_AT91SAM9260EK=y > diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h > index a6a80de..c4b2e16 100644 > --- a/include/configs/at91sam9260ek.h > +++ b/include/configs/at91sam9260ek.h > @@ -90,7 +90,6 @@ > #define CONFIG_CMD_PING 1 > #define CONFIG_CMD_DHCP 1 > #define CONFIG_CMD_NAND 1 > -#define CONFIG_CMD_MMC > #define CONFIG_CMD_FAT > #define CONFIG_CMD_USB 1 > > @@ -133,14 +132,17 @@ > # define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9260EK > #endif > > -/* DataFlash */ > #ifndef CONFIG_AT91SAM9G20EK_2MMC > +/* DataFlash */ > #define CONFIG_ATMEL_DATAFLASH_SPI > #define CONFIG_HAS_DATAFLASH 1 > #define CONFIG_SYS_MAX_DATAFLASH_BANKS 2 > #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 /* CS0 */ > #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 0xD0000000 /* CS1 */ > #define AT91_SPI_CLK 15000000 > +#else > +/* Enable MMC. The MCCK is conflicted with DataFlash */ > +#define CONFIG_CMD_MMC > #endif > > #ifdef CONFIG_AT91SAM9G20EK > Best Regards, Bo Shen