Merge tag 'efi-2020-01-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / include / configs / at91rm9200ek.h

diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index ee44255b20c55977d6f0f1ee234ca6f0522ed0cd..8bfba35e16a7960078de2192b47ca971b1b08448 100644 (file)
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -114,19 +114,15 @@
 #define CONFIG_DRIVER_AT91EMAC
 #define CONFIG_SYS_RX_ETH_BUFFER       16
 #define CONFIG_RMII
-#define CONFIG_MII
 
 /*
  * NOR Flash
  */
-#define CONFIG_FLASH_CFI_DRIVER
-#define CONFIG_SYS_FLASH_CFI
 #define CONFIG_SYS_FLASH_BASE          0x10000000
 #define PHYS_FLASH_1                   CONFIG_SYS_FLASH_BASE
 #define PHYS_FLASH_SIZE                        SZ_8M
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 #define CONFIG_SYS_MAX_FLASH_SECT      256
-#define CONFIG_SYS_FLASH_PROTECTION
 
 /*
  * USB Config
@@ -149,7 +145,7 @@
  */
 #define CONFIG_ENV_ADDR                        \
                (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN)
-#define CONFIG_ENV_SIZE                        SZ_64K /* sectors are 64K here */
+
 /* The following #defines are needed to get flash environment right */
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
 #define CONFIG_SYS_MONITOR_LEN         SZ_256K