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

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

diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h
index aeda474..3c46ae0 100644 (file)
--- a/include/configs/MCR3000.h
+++ b/include/configs/MCR3000.h
@@ -1,15 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2010-2017 CS Systemes d'Information
  * Christophe Leroy <christophe.leroy@c-s.fr>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
 /* High Level Configuration Options */
-#define CONFIG_MISC_INIT_R             1       /* Call misc_init_r     */
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "sdram_type=SDRAM\0"                                            \
@@ -78,8 +76,6 @@
 
 /* FLASH organization */
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_FLASH_CFI           1
-#define CONFIG_FLASH_CFI_DRIVER                1
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 #define CONFIG_SYS_MAX_FLASH_SECT      35
 #define CONFIG_SYS_FLASH_ERASE_TOUT    120000