Merge git://git.denx.de/u-boot-dm

[platform/kernel/u-boot.git] / include / configs / blanche.h

diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index 0deb350..cb80b90 100755 (executable)
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -39,8 +39,7 @@
 #undef CONFIG_SYS_LOADS_BAUD_CHANGE
 
 /* FLASH */
-/* #define CONFIG_SYS_NO_FLASH */      /* uncomment if use QSPI-FLASH */
-#if defined(CONFIG_SYS_NO_FLASH)
+#if !defined(CONFIG_MTD_NOR_FLASH)
 #define CONFIG_SYS_TEXT_BASE   0x40000000
 #define CONFIG_SPI
 #define CONFIG_SH_QSPI
@@ -80,7 +79,7 @@
 #define CONFIG_SYS_TMU_CLK_DIV 4
 
 /* ENV setting */
-#if defined(CONFIG_SYS_NO_FLASH)
+#if !defined(CONFIG_MTD_NOR_FLASH)
 #else
 #undef  CONFIG_ENV_IS_IN_SPI_FLASH
 #undef  CONFIG_ENV_ADDR
@@ -95,8 +94,6 @@
 /* USB */
 #undef CONFIG_CMD_USB
 
-#define CONFIG_GENERIC_MMC
-
 /* Module stop status bits */
 /* INTC-RT */
 #define CONFIG_SMSTP0_ENA      0x00400000