Merge tag 'efi-2019-07-rc5-3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

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

diff --git a/include/configs/spear3xx_evb.h b/include/configs/spear3xx_evb.h
index 4dbf919..2f642b1 100644 (file)
--- a/include/configs/spear3xx_evb.h
+++ b/include/configs/spear3xx_evb.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2009
  * Vipin Kumar, STMicroelectronics, <vipin.kumar@st.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -81,12 +80,7 @@
 #endif
 
 #if defined(CONFIG_SPEAR_EMI)
-
-#define CONFIG_SYS_FLASH_CFI
-#define CONFIG_FLASH_CFI_DRIVER
-
 #if defined(CONFIG_SPEAR310)
-#define CONFIG_SYS_FLASH_PROTECTION
 #define CONFIG_SYS_FLASH_BASE                  0x50000000
 #define CONFIG_SYS_CS1_FLASH_BASE              0x60000000
 #define CONFIG_SYS_CS2_FLASH_BASE              0x70000000
@@ -102,7 +96,6 @@
 #define CONFIG_SYS_MAX_FLASH_BANKS             6
 
 #elif defined(CONFIG_SPEAR320)
-#define CONFIG_SYS_FLASH_PROTECTION
 #define CONFIG_SYS_FLASH_BASE                  0x44000000
 #define CONFIG_SYS_CS1_FLASH_BASE              0x45000000
 #define CONFIG_SYS_CS2_FLASH_BASE              0x46000000