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 / imx7_spl.h

diff --git a/include/configs/imx7_spl.h b/include/configs/imx7_spl.h
index 93d7096..7ef7017 100644 (file)
--- a/include/configs/imx7_spl.h
+++ b/include/configs/imx7_spl.h
@@ -1,20 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * SPL definitions for the i.MX7 SPL
  *
  * (C) Copyright 2017 CompuLab, Ltd. http://www.compulab.com
  *
  * Author: Uri Mashiach <uri.mashiach@compulab.co.il>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __IMX7_SPL_CONFIG_H
 #define __IMX7_SPL_CONFIG_H
 
 #ifdef CONFIG_SPL
-
-#define CONFIG_SPL_FRAMEWORK
-
 /*
  * see figure 6-22 in i.MX 7Dual/Solo Reference manuals:
  *  - IMX7D/S OCRAM free area RAM (OCRAM) is from 0x00910000 to
@@ -25,7 +21,6 @@
  *    and some padding thus 'our' max size is really 0x00946BB8 - 0x00911000.
  *    64KB is more then enough for the SPL.
  */
-#define CONFIG_SPL_TEXT_BASE           0x00911000
 #define CONFIG_SPL_MAX_SIZE            0x10000
 #define CONFIG_SPL_STACK               0x00946BB8
 /*
@@ -42,7 +37,7 @@
 #endif
 
 /* Define the payload for FAT/EXT support */
-#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT)
+#if defined(CONFIG_SPL_FS_FAT) || defined(CONFIG_SPL_FS_EXT4)
 # ifdef CONFIG_OF_CONTROL
 #  define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME      "u-boot-dtb.img"
 # else