global: Migrate CONFIG_STACKBASE to CFG
[platform/kernel/u-boot.git] / include / configs / ls1088ardb.h
index 6f36dd4..a174914 100644 (file)
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2017, 2020 NXP
+ * Copyright 2017, 2020-2021 NXP
  */
 
 #ifndef __LS1088A_RDB_H
 
 #if defined(CONFIG_TFABOOT) || \
        defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_QIXIS_I2C_ACCESS
-#endif
 #define SYS_NO_FLASH
 #endif
 
-#define CONFIG_SYS_CLK_FREQ            100000000
-#define CONFIG_DDR_CLK_FREQ            100000000
 #define COUNTER_FREQUENCY_REAL         25000000        /* 25MHz */
-#define COUNTER_FREQUENCY              25000000        /* 25MHz */
 
-#define CONFIG_DDR_SPD
-#ifdef CONFIG_EMU
-#define CONFIG_SYS_FSL_DDR_EMU
-#define CONFIG_SYS_MXC_I2C1_SPEED      40000000
-#define CONFIG_SYS_MXC_I2C2_SPEED      40000000
-#else
-#define CONFIG_DDR_ECC
-#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER
-#define CONFIG_MEM_INIT_VALUE          0xdeadbeef
-#endif
 #define SPD_EEPROM_ADDRESS     0x51
-#define CONFIG_SYS_SPD_BUS_NUM 0       /* SPD on I2C bus 0 */
-#define CONFIG_DIMM_SLOTS_PER_CTLR     1
 
 
 #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
-#define CONFIG_SYS_NOR0_CSPR_EXT       (0x0)
-#define CONFIG_SYS_NOR_AMASK           IFC_AMASK(128 * 1024 * 1024)
-#define CONFIG_SYS_NOR_AMASK_EARLY     IFC_AMASK(64 * 1024 * 1024)
+#define CFG_SYS_NOR0_CSPR_EXT  (0x0)
+#define CFG_SYS_NOR_AMASK              IFC_AMASK(128 * 1024 * 1024)
+#define CFG_SYS_NOR_AMASK_EARLY        IFC_AMASK(64 * 1024 * 1024)
 
-#define CONFIG_SYS_NOR0_CSPR                                   \
-       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS)             | \
+#define CFG_SYS_NOR0_CSPR                                      \
+       (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS)                | \
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
-#define CONFIG_SYS_NOR0_CSPR_EARLY                             \
-       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS_EARLY)       | \
+#define CFG_SYS_NOR0_CSPR_EARLY                                \
+       (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS_EARLY)  | \
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
-#define CONFIG_SYS_NOR_CSOR    CSOR_NOR_ADM_SHIFT(6)
-#define CONFIG_SYS_NOR_FTIM0   (FTIM0_NOR_TACSE(0x1) | \
+#define CFG_SYS_NOR_CSOR       CSOR_NOR_ADM_SHIFT(6)
+#define CFG_SYS_NOR_FTIM0      (FTIM0_NOR_TACSE(0x1) | \
                                FTIM0_NOR_TEADC(0x1) | \
                                FTIM0_NOR_TEAHC(0x1))
-#define CONFIG_SYS_NOR_FTIM1   (FTIM1_NOR_TACO(0x1) | \
+#define CFG_SYS_NOR_FTIM1      (FTIM1_NOR_TACO(0x1) | \
                                FTIM1_NOR_TRAD_NOR(0x1))
-#define CONFIG_SYS_NOR_FTIM2   (FTIM2_NOR_TCS(0x0) | \
+#define CFG_SYS_NOR_FTIM2      (FTIM2_NOR_TCS(0x0) | \
                                FTIM2_NOR_TCH(0x0) | \
                                FTIM2_NOR_TWP(0x1))
-#define CONFIG_SYS_NOR_FTIM3   0x04000000
-#define CONFIG_SYS_IFC_CCR     0x01000000
+#define CFG_SYS_NOR_FTIM3      0x04000000
+#define CFG_SYS_IFC_CCR        0x01000000
 
 #ifndef SYS_NO_FLASH
-#define CONFIG_SYS_FLASH_QUIET_TEST
-#define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
-
-#define CONFIG_SYS_MAX_FLASH_BANKS     1       /* number of banks */
-#define CONFIG_SYS_MAX_FLASH_SECT      1024    /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
-
-#define CONFIG_SYS_FLASH_EMPTY_INFO
-#define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE }
+#define CFG_SYS_FLASH_BANKS_LIST       { CFG_SYS_FLASH_BASE }
 #endif
 #endif
 
-#ifndef SPL_NO_IFC
-#define CONFIG_NAND_FSL_IFC
-#endif
-
-#define CONFIG_SYS_NAND_MAX_ECCPOS     256
-#define CONFIG_SYS_NAND_MAX_OOBFREE    2
-
-#define CONFIG_SYS_NAND_CSPR_EXT       (0x0)
-#define CONFIG_SYS_NAND_CSPR   (CSPR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \
+#define CFG_SYS_NAND_CSPR_EXT  (0x0)
+#define CFG_SYS_NAND_CSPR      (CSPR_PHYS_ADDR(CFG_SYS_NAND_BASE_PHYS) \
                                | CSPR_PORT_SIZE_8 /* Port Size = 8 bit */ \
                                | CSPR_MSEL_NAND        /* MSEL = NAND */ \
                                | CSPR_V)
-#define CONFIG_SYS_NAND_AMASK  IFC_AMASK(64 * 1024)
+#define CFG_SYS_NAND_AMASK     IFC_AMASK(64 * 1024)
 
-#define CONFIG_SYS_NAND_CSOR    (CSOR_NAND_ECC_ENC_EN   /* ECC on encode */ \
+#define CFG_SYS_NAND_CSOR    (CSOR_NAND_ECC_ENC_EN   /* ECC on encode */ \
                                | CSOR_NAND_ECC_DEC_EN  /* ECC on decode */ \
                                | CSOR_NAND_ECC_MODE_4  /* 4-bit ECC */ \
                                | CSOR_NAND_RAL_3       /* RAL = 3Byes */ \
                                | CSOR_NAND_SPRZ_64/* Spare size = 64 */ \
                                | CSOR_NAND_PB(64))     /*Pages Per Block = 64*/
 
-#define CONFIG_SYS_NAND_ONFI_DETECTION
-
 /* ONFI NAND Flash mode0 Timing Params */
-#define CONFIG_SYS_NAND_FTIM0          (FTIM0_NAND_TCCST(0x07) | \
+#define CFG_SYS_NAND_FTIM0             (FTIM0_NAND_TCCST(0x07) | \
                                        FTIM0_NAND_TWP(0x18)   | \
                                        FTIM0_NAND_TWCHT(0x07) | \
                                        FTIM0_NAND_TWH(0x0a))
-#define CONFIG_SYS_NAND_FTIM1          (FTIM1_NAND_TADLE(0x32) | \
+#define CFG_SYS_NAND_FTIM1             (FTIM1_NAND_TADLE(0x32) | \
                                        FTIM1_NAND_TWBE(0x39)  | \
                                        FTIM1_NAND_TRR(0x0e)   | \
                                        FTIM1_NAND_TRP(0x18))
-#define CONFIG_SYS_NAND_FTIM2          (FTIM2_NAND_TRAD(0x0f) | \
+#define CFG_SYS_NAND_FTIM2             (FTIM2_NAND_TRAD(0x0f) | \
                                        FTIM2_NAND_TREH(0x0a) | \
                                        FTIM2_NAND_TWHRE(0x1e))
-#define CONFIG_SYS_NAND_FTIM3          0x0
-
-#define CONFIG_SYS_NAND_BASE_LIST      { CONFIG_SYS_NAND_BASE }
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
-#define CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_SYS_NAND_FTIM3             0x0
 
-#define CONFIG_SYS_NAND_BLOCK_SIZE     (128 * 1024)
+#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
 
-#ifndef SPL_NO_QIXIS
-#define CONFIG_FSL_QIXIS
-#endif
-
-#define CONFIG_SYS_I2C_FPGA_ADDR       0x66
+#define CFG_SYS_I2C_FPGA_ADDR  0x66
 #define QIXIS_BRDCFG4_OFFSET            0x54
 #define QIXIS_LBMAP_SWITCH             2
 #define QIXIS_QMAP_MASK                        0xe0
 #define QIXIS_RCFG_CTL_WATCHDOG_ENBLE  0x08
 #define        QIXIS_RST_FORCE_MEM             0x01
 
-#define CONFIG_SYS_FPGA_CSPR_EXT       (0x0)
-#define CONFIG_SYS_FPGA_CSPR           (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS_EARLY) \
+#define CFG_SYS_FPGA_CSPR_EXT  (0x0)
+#define CFG_SYS_FPGA_CSPR              (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS_EARLY) \
                                        | CSPR_PORT_SIZE_8 \
                                        | CSPR_MSEL_GPCM \
                                        | CSPR_V)
                                        | CSPR_MSEL_GPCM \
                                        | CSPR_V)
 
-#define CONFIG_SYS_FPGA_AMASK          IFC_AMASK(64*1024)
-#define CONFIG_SYS_FPGA_CSOR           CSOR_GPCM_ADM_SHIFT(0)
+#define CFG_SYS_FPGA_AMASK             IFC_AMASK(64*1024)
+#define CFG_SYS_FPGA_CSOR              CSOR_GPCM_ADM_SHIFT(0)
 /* QIXIS Timing parameters*/
 #define SYS_FPGA_CS_FTIM0      (FTIM0_GPCM_TACSE(0x0e) | \
                                        FTIM0_GPCM_TEADC(0x0e) | \
 
 #if defined(CONFIG_TFABOOT) || \
        defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_FPGA_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CONFIG_SYS_FPGA_CSPR
-#define CONFIG_SYS_CSPR2_FINAL         SYS_FPGA_CSPR_FINAL
-#define CONFIG_SYS_AMASK2              CONFIG_SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR2               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS2_FTIM0           SYS_FPGA_CS_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           SYS_FPGA_CS_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           SYS_FPGA_CS_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           SYS_FPGA_CS_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_FPGA_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_FPGA_CSPR
+#define CFG_SYS_CSPR2_FINAL            SYS_FPGA_CSPR_FINAL
+#define CFG_SYS_AMASK2         CFG_SYS_FPGA_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS2_FTIM0              SYS_FPGA_CS_FTIM0
+#define CFG_SYS_CS2_FTIM1              SYS_FPGA_CS_FTIM1
+#define CFG_SYS_CS2_FTIM2              SYS_FPGA_CS_FTIM2
+#define CFG_SYS_CS2_FTIM3              SYS_FPGA_CS_FTIM3
 #else
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR_EARLY
-#define CONFIG_SYS_CSPR0_FINAL         CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK0              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR0               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS0_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS0_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          CFG_SYS_NOR0_CSPR_EARLY
+#define CFG_SYS_CSPR0_FINAL            CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK0         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR0          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS0_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS0_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS0_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS0_FTIM3              CFG_SYS_NOR_FTIM3
 #endif
 
-#define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
+#define CFG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
 
 #define I2C_MUX_CH_VOL_MONITOR         0xA
 /* Voltage monitor on channel 2*/
 #define I2C_VOL_MONITOR_BUS_V_SHIFT    3
 #define I2C_SVDD_MONITOR_ADDR          0x4F
 
-#define CONFIG_VID_FLS_ENV              "ls1088ardb_vdd_mv"
-#define CONFIG_VID
-
 /* The lowest and highest voltage allowed for LS1088ARDB */
 #define VDD_MV_MIN                     819
 #define VDD_MV_MAX                     1212
 
-#define CONFIG_VOL_MONITOR_LTC3882_SET
-#define CONFIG_VOL_MONITOR_LTC3882_READ
-
 #define PWM_CHANNEL0                    0x0
 
 /*
 #define I2C_MUX_CH_DEFAULT             0x8
 #define I2C_MUX_CH5                    0xD
 
-#ifndef SPL_NO_RTC
 /*
 * RTC configuration
 */
-#define RTC
-#define CONFIG_SYS_I2C_RTC_ADDR         0x51  /* Channel 3*/
-#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
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN         1
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS      3
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  5
-
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE
-#else
-#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
-#endif
-
-#define CONFIG_FSL_MEMAC
+#define CFG_SYS_I2C_RTC_ADDR         0x51  /* Channel 3*/
 
 #ifndef SPL_NO_ENV
 /* 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 */
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 #ifdef CONFIG_TFABOOT
-#define CONFIG_EXTRA_ENV_SETTINGS              \
+#define CFG_EXTRA_ENV_SETTINGS         \
        "BOARD=ls1088ardb\0"                    \
        "hwconfig=fsl_ddr:bank_intlv=auto\0"    \
        "ramdisk_addr=0x800000\0"               \
        "ramdisk_size=0x2000000\0"              \
        "fdt_high=0xa0000000\0"                 \
        "initrd_high=0xffffffffffffffff\0"      \
-       "fdt_addr=0x64f00000\0"                 \
        "kernel_addr=0x1000000\0"               \
        "kernel_addr_sd=0x8000\0"               \
        "kernelhdr_addr_sd=0x3000\0"            \
                " && esbc_validate ${kernelheader_addr_r};"     \
                "bootm $load_addr#$BOARD\0"
 #else
-#define CONFIG_EXTRA_ENV_SETTINGS              \
+#define CFG_EXTRA_ENV_SETTINGS         \
        "BOARD=ls1088ardb\0"                    \
        "hwconfig=fsl_ddr:bank_intlv=auto\0"    \
        "ramdisk_addr=0x800000\0"               \
        "ramdisk_size=0x2000000\0"              \
        "fdt_high=0xa0000000\0"                 \
        "initrd_high=0xffffffffffffffff\0"      \
-       "fdt_addr=0x64f00000\0"                 \
        "kernel_addr=0x1000000\0"               \
        "kernel_addr_sd=0x8000\0"               \
        "kernelhdr_addr_sd=0x3000\0"            \
                "bootm $load_addr#$BOARD\0"
 #endif /* CONFIG_TFABOOT */
 
-#undef CONFIG_BOOTCOMMAND
 #ifdef CONFIG_TFABOOT
 #define QSPI_NOR_BOOTCOMMAND                                   \
        "sf read 0x80001000 0xd00000 0x100000;"         \
 #else
 #if defined(CONFIG_QSPI_BOOT)
 /* Try to boot an on-QSPI kernel first, then do normal distro boot */
-#define CONFIG_BOOTCOMMAND                                      \
-               "sf read 0x80001000 0xd00000 0x100000;"         \
-               "env exists mcinitcmd && env exists secureboot "        \
-               " && sf read 0x806C0000 0x6C0000 0x100000 "     \
-               "&& esbc_validate 0x806C0000;env exists mcinitcmd "     \
-               "&& fsl_mc lazyapply dpl 0x80001000;"           \
-               "run distro_bootcmd;run qspi_bootcmd;"          \
-               "env exists secureboot && esbc_halt;"
 
 /* Try to boot an on-SD kernel first, then do normal distro boot */
-#elif defined(CONFIG_SD_BOOT)
-#define CONFIG_BOOTCOMMAND                                      \
-               "env exists mcinitcmd && mmcinfo; "             \
-               "mmc read 0x80001000 0x6800 0x800; "            \
-               "env exists mcinitcmd && env exists secureboot "        \
-               " && mmc read 0x806C0000 0x3600 0x20 "          \
-               "&& esbc_validate 0x806C0000;env exists mcinitcmd "     \
-               "&& fsl_mc lazyapply dpl 0x80001000;"           \
-               "run distro_bootcmd;run sd_bootcmd;"            \
-               "env exists secureboot && esbc_halt;"
 #endif
 #endif /* CONFIG_TFABOOT */
 
 #define QSGMII2_PORT2_PHY_ADDR         0x1d
 #define QSGMII2_PORT3_PHY_ADDR         0x1e
 #define QSGMII2_PORT4_PHY_ADDR         0x1f
-
-#define CONFIG_ETHPRIME                "DPMAC1@xgmii"
-#define CONFIG_PHY_GIGE
 #endif
 #endif
 
-/*  MMC  */
-#ifdef CONFIG_MMC
-#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
-#endif
-
 #ifndef SPL_NO_ENV
 
 #define BOOT_TARGET_DEVICES(func) \