Prepare v2018.07-rc1

[u-boot] / include / configs / sama5d3xek.h

diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index 843aaa6394b484e2befd9cc587842aa5435f655d..d5e6b7f4e22ca6b61c0f0641fc04dc96b7b19957 100644 (file)
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Configuation settings for the SAMA5D3xEK board.
  *
@@ -6,8 +7,6 @@
  * based on at91sam9m10g45ek.h by:
  * Stelian Pop <stelian@popies.net>
  * Lead Tech Design <www.leadtechdesign.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -15,8 +14,6 @@
 
 #include "at91-sama5_common.h"
 
-#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-
 /*
  * This needs to be defined for the OHCI code to work but it is defined as
  * ATMEL_ID_UHPHS in the CPU specific header files.
@@ -104,7 +101,6 @@
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
 
 #elif CONFIG_SPI_BOOT
-#define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x10000
 
 #elif CONFIG_NAND_BOOT