Convert CONFIG_ID_EEPROM to Kconfig

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

diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 6f36dd4..fd2e508 100644 (file)
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2017, 2020 NXP
+ * Copyright 2017, 2020-2021 NXP
  */
 
 #ifndef __LS1088A_RDB_H
@@ -241,7 +241,6 @@
 #endif
 
 /* EEPROM */
-#define CONFIG_ID_EEPROM
 #define CONFIG_SYS_I2C_EEPROM_NXID
 #define CONFIG_SYS_EEPROM_BUS_NUM              0
 #define CONFIG_SYS_I2C_EEPROM_ADDR             0x57
@@ -261,45 +260,45 @@
 /* Initial environment variables */
 #ifdef CONFIG_TFABOOT
 #define QSPI_MC_INIT_CMD                               \
-       "sf probe 0:0;sf read 0x80000000 0xA00000 0x100000;"    \
-       "sf read 0x80100000 0xE00000 0x100000;"                         \
+       "sf probe 0:0;sf read 0x80a00000 0xA00000 0x200000;"    \
+       "sf read 0x80e00000 0xE00000 0x100000;"                         \
        "env exists secureboot && "                     \
        "sf read 0x80640000 0x640000 0x40000 && "       \
        "sf read 0x80680000 0x680000 0x40000 && "       \
        "esbc_validate 0x80640000 && "                  \
        "esbc_validate 0x80680000 ;"                    \
-       "fsl_mc start mc 0x80000000 0x80100000\0"
+       "fsl_mc start mc 0x80a00000 0x80e00000\0"
 #define SD_MC_INIT_CMD                         \
-       "mmcinfo;mmc read 0x80000000 0x5000 0x800;"             \
-       "mmc read 0x80100000 0x7000 0x800;"                             \
+       "mmcinfo;mmc read 0x80a00000 0x5000 0x1000;"            \
+       "mmc read 0x80e00000 0x7000 0x800;"                             \
        "env exists secureboot && "                     \
        "mmc read 0x80640000 0x3200 0x20 && "           \
        "mmc read 0x80680000 0x3400 0x20 && "           \
        "esbc_validate 0x80640000 && "                  \
        "esbc_validate 0x80680000 ;"                    \
-       "fsl_mc start mc 0x80000000 0x80100000\0"
+       "fsl_mc start mc 0x80a00000 0x80e00000\0"
 #else
 #if defined(CONFIG_QSPI_BOOT)
 #define MC_INIT_CMD                            \
-       "mcinitcmd=sf probe 0:0;sf read 0x80000000 0xA00000 0x100000;"  \
-       "sf read 0x80100000 0xE00000 0x100000;"                         \
+       "mcinitcmd=sf probe 0:0;sf read 0x80a00000 0xA00000 0x200000;"  \
+       "sf read 0x80e00000 0xE00000 0x100000;"                         \
        "env exists secureboot && "                     \
        "sf read 0x80640000 0x640000 0x40000 && "       \
        "sf read 0x80680000 0x680000 0x40000 && "       \
        "esbc_validate 0x80640000 && "                  \
        "esbc_validate 0x80680000 ;"                    \
-       "fsl_mc start mc 0x80000000 0x80100000\0"       \
+       "fsl_mc start mc 0x80a00000 0x80e00000\0"       \
        "mcmemsize=0x70000000\0"
 #elif defined(CONFIG_SD_BOOT)
 #define MC_INIT_CMD                            \
-       "mcinitcmd=mmcinfo;mmc read 0x80000000 0x5000 0x800;"           \
-       "mmc read 0x80100000 0x7000 0x800;"                             \
+       "mcinitcmd=mmcinfo;mmc read 0x80a00000 0x5000 0x1000;"          \
+       "mmc read 0x80e00000 0x7000 0x800;"                             \
        "env exists secureboot && "                     \
        "mmc read 0x80640000 0x3200 0x20 && "           \
        "mmc read 0x80680000 0x3400 0x20 && "           \
        "esbc_validate 0x80640000 && "                  \
        "esbc_validate 0x80680000 ;"                    \
-       "fsl_mc start mc 0x80000000 0x80100000\0"       \
+       "fsl_mc start mc 0x80a00000 0x80e00000\0"       \
        "mcmemsize=0x70000000\0"
 #endif
 #endif /* CONFIG_TFABOOT */
@@ -507,11 +506,6 @@
 #endif
 #endif
 
-/*  MMC  */
-#ifdef CONFIG_MMC
-#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
-#endif
-
 #ifndef SPL_NO_ENV
 
 #define BOOT_TARGET_DEVICES(func) \