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 959c521..d4e0f67 100644 (file)
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -21,17 +21,12 @@
 #define RCAR_GEN2_SDRAM_SIZE           (1024u * 1024 * 1024)
 #define RCAR_GEN2_UBOOT_SDRAM_SIZE     (512 * 1024 * 1024)
 
-#undef CONFIG_SYS_LOADS_BAUD_CHANGE
-
 /* FLASH */
-#if !defined(CONFIG_MTD_NOR_FLASH)
-#define CONFIG_SH_QSPI_BASE    0xE6B10000
-#else
-#define CONFIG_FLASH_SHOW_PROGRESS     45
-#define CONFIG_SYS_FLASH_BASE          0x00000000
-#define CONFIG_SYS_FLASH_SIZE          0x04000000      /* 64 MB */
-#define CONFIG_SYS_FLASH_BANKS_LIST    { (CONFIG_SYS_FLASH_BASE) }
-#define CONFIG_SYS_FLASH_BANKS_SIZES   { (CONFIG_SYS_FLASH_SIZE) }
+#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) }
+#define CFG_SYS_FLASH_BANKS_SIZES      { (CFG_SYS_FLASH_SIZE) }
 #endif
 
 /* Board Clock */