Merge branch 'master' into next

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

diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index fe09997..d4e0f67 100644 (file)
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -22,9 +22,7 @@
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE     (512 * 1024 * 1024)
 
 /* FLASH */
-#if !defined(CONFIG_MTD_NOR_FLASH)
-#define CONFIG_SH_QSPI_BASE    0xE6B10000
-#else
+#if defined(CONFIG_MTD_NOR_FLASH)
 #define CFG_SYS_FLASH_BASE             0x00000000
 #define CFG_SYS_FLASH_SIZE             0x04000000      /* 64 MB */
 #define CFG_SYS_FLASH_BANKS_LIST       { (CFG_SYS_FLASH_BASE) }