global: Move remaining CONFIG_SYS_* to CFG_SYS_*
[platform/kernel/u-boot.git] / include / configs / ls1088aqds.h
index 4d04833..d84622f 100644 (file)
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2017, 2020 NXP
+ * Copyright 2017, 2020-2021 NXP
  */
 
 #ifndef __LS1088A_QDS_H
 
 #include "ls1088a_common.h"
 
-
-#ifndef __ASSEMBLY__
-unsigned long get_board_sys_clk(void);
-unsigned long get_board_ddr_clk(void);
-#endif
-
-#ifdef CONFIG_TFABOOT
-#define CONFIG_MISC_INIT_R
-#endif
-
 #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-#define CONFIG_QIXIS_I2C_ACCESS
 #define SYS_NO_FLASH
-
-#define CONFIG_SYS_CLK_FREQ            100000000
-#define CONFIG_DDR_CLK_FREQ            100000000
-#else
-#define CONFIG_QIXIS_I2C_ACCESS
-#if !CONFIG_IS_ENABLED(DM_I2C)
-#define CONFIG_SYS_I2C_EARLY_INIT
-#endif
-#define CONFIG_SYS_CLK_FREQ            get_board_sys_clk()
-#define CONFIG_DDR_CLK_FREQ            get_board_ddr_clk()
 #endif
 
-#define COUNTER_FREQUENCY_REAL         (CONFIG_SYS_CLK_FREQ/4)
-#define COUNTER_FREQUENCY              25000000        /* 25MHz */
+#define COUNTER_FREQUENCY_REAL         (get_board_sys_clk()/4)
 
-#define CONFIG_DIMM_SLOTS_PER_CTLR     1
-
-#define CONFIG_DDR_SPD
-#define CONFIG_DDR_ECC
-#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER
 #define CONFIG_MEM_INIT_VALUE           0xdeadbeef
 #define SPD_EEPROM_ADDRESS             0x51
-#define CONFIG_SYS_SPD_BUS_NUM         0
 
 
 /*
  * IFC Definitions
  */
 #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_NOR1_CSPR                                   \
-       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH1_BASE_PHYS)            | \
+#define CFG_SYS_NOR1_CSPR                                      \
+       (CSPR_PHYS_ADDR(CFG_SYS_FLASH1_BASE_PHYS)               | \
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
-#define CONFIG_SYS_NOR1_CSPR_EARLY                             \
-       (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH1_BASE_PHYS_EARLY)      | \
+#define CFG_SYS_NOR1_CSPR_EARLY                                \
+       (CSPR_PHYS_ADDR(CFG_SYS_FLASH1_BASE_PHYS_EARLY) | \
        CSPR_PORT_SIZE_16                                       | \
        CSPR_MSEL_NOR                                           | \
        CSPR_V)
-#define CONFIG_SYS_NOR_CSOR    CSOR_NOR_ADM_SHIFT(12)
-#define CONFIG_SYS_NOR_FTIM0   (FTIM0_NOR_TACSE(0x4) | \
+#define CFG_SYS_NOR_CSOR       CSOR_NOR_ADM_SHIFT(12)
+#define CFG_SYS_NOR_FTIM0      (FTIM0_NOR_TACSE(0x4) | \
                                FTIM0_NOR_TEADC(0x5) | \
                                FTIM0_NOR_TAVDS(0x6) | \
                                FTIM0_NOR_TEAHC(0x5))
-#define CONFIG_SYS_NOR_FTIM1   (FTIM1_NOR_TACO(0x35) | \
+#define CFG_SYS_NOR_FTIM1      (FTIM1_NOR_TACO(0x35) | \
                                FTIM1_NOR_TRAD_NOR(0x1a) | \
                                FTIM1_NOR_TSEQRAD_NOR(0x13))
-#define CONFIG_SYS_NOR_FTIM2   (FTIM2_NOR_TCS(0x8) | \
+#define CFG_SYS_NOR_FTIM2      (FTIM2_NOR_TCS(0x8) | \
                                FTIM2_NOR_TCH(0x8) | \
                                FTIM2_NOR_TWPH(0xe) | \
                                FTIM2_NOR_TWP(0x1c))
-#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     2       /* 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,\
-                                        CONFIG_SYS_FLASH_BASE + 0x40000000}
+#define CFG_SYS_FLASH_BANKS_LIST       { CFG_SYS_FLASH_BASE,\
+                                        CFG_SYS_FLASH_BASE + 0x40000000}
 #endif
 #endif
 
-#define CONFIG_NAND_FSL_IFC
-#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 */ \
@@ -123,30 +84,24 @@ unsigned long get_board_ddr_clk(void);
                                | 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 CFG_SYS_NAND_FTIM3             0x0
 
-#define CONFIG_SYS_NAND_BASE_LIST      { CONFIG_SYS_NAND_BASE }
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
+#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
 #define CONFIG_MTD_NAND_VERIFY_WRITE
 
-#define CONFIG_SYS_NAND_BLOCK_SIZE     (128 * 1024)
-
-#define CONFIG_FSL_QIXIS
-#define CONFIG_SYS_I2C_FPGA_ADDR       0x66
+#define CFG_SYS_I2C_FPGA_ADDR  0x66
 #define QIXIS_LBMAP_SWITCH             6
 #define QIXIS_QMAP_MASK                        0xe0
 #define QIXIS_QMAP_SHIFT               5
@@ -172,8 +127,8 @@ unsigned long get_board_ddr_clk(void);
 #define QIXIS_SDID_MASK                        0x07
 #define QIXIS_ESDHC_NO_ADAPTER         0x7
 
-#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)
@@ -184,9 +139,9 @@ unsigned long get_board_ddr_clk(void);
 
 #define SYS_FPGA_AMASK         IFC_AMASK(64 * 1024)
 #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-#define CONFIG_SYS_FPGA_CSOR           CSOR_GPCM_ADM_SHIFT(0)
+#define CFG_SYS_FPGA_CSOR              CSOR_GPCM_ADM_SHIFT(0)
 #else
-#define CONFIG_SYS_FPGA_CSOR           CSOR_GPCM_ADM_SHIFT(12)
+#define CFG_SYS_FPGA_CSOR              CSOR_GPCM_ADM_SHIFT(12)
 #endif
 /* QIXIS Timing parameters*/
 #define SYS_FPGA_CS_FTIM0      (FTIM0_GPCM_TACSE(0x0e) | \
@@ -200,102 +155,102 @@ unsigned long get_board_ddr_clk(void);
 #define SYS_FPGA_CS_FTIM3      0x0
 
 #ifdef CONFIG_TFABOOT
-#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 CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR_EARLY
-#define CONFIG_SYS_CSPR1_FINAL         CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK_EARLY
-#define CONFIG_SYS_AMASK1_FINAL                CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CONFIG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK2              CONFIG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR2               CONFIG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CONFIG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CONFIG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CONFIG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CONFIG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR3_EXT           CONFIG_SYS_FPGA_CSPR_EXT
-#define CONFIG_SYS_CSPR3               CONFIG_SYS_FPGA_CSPR
-#define CONFIG_SYS_CSPR3_FINAL         SYS_FPGA_CSPR_FINAL
-#define CONFIG_SYS_AMASK3              SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR3               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS3_FTIM0           SYS_FPGA_CS_FTIM0
-#define CONFIG_SYS_CS3_FTIM1           SYS_FPGA_CS_FTIM1
-#define CONFIG_SYS_CS3_FTIM2           SYS_FPGA_CS_FTIM2
-#define CONFIG_SYS_CS3_FTIM3           SYS_FPGA_CS_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
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR1_CSPR_EARLY
+#define CFG_SYS_CSPR1_FINAL            CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK_EARLY
+#define CFG_SYS_AMASK1_FINAL           CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR3_EXT              CFG_SYS_FPGA_CSPR_EXT
+#define CFG_SYS_CSPR3          CFG_SYS_FPGA_CSPR
+#define CFG_SYS_CSPR3_FINAL            SYS_FPGA_CSPR_FINAL
+#define CFG_SYS_AMASK3         SYS_FPGA_AMASK
+#define CFG_SYS_CSOR3          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS3_FTIM0              SYS_FPGA_CS_FTIM0
+#define CFG_SYS_CS3_FTIM1              SYS_FPGA_CS_FTIM1
+#define CFG_SYS_CS3_FTIM2              SYS_FPGA_CS_FTIM2
+#define CFG_SYS_CS3_FTIM3              SYS_FPGA_CS_FTIM3
 #else
 #if 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              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         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 CONFIG_SYS_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR_EARLY
-#define CONFIG_SYS_CSPR1_FINAL         CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              CONFIG_SYS_NOR_AMASK_EARLY
-#define CONFIG_SYS_AMASK1_FINAL                CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR1               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS1_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS1_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS1_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS1_FTIM3           CONFIG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NAND_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CONFIG_SYS_NAND_CSPR
-#define CONFIG_SYS_AMASK2              CONFIG_SYS_NAND_AMASK
-#define CONFIG_SYS_CSOR2               CONFIG_SYS_NAND_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CONFIG_SYS_NAND_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CONFIG_SYS_NAND_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CONFIG_SYS_NAND_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CONFIG_SYS_NAND_FTIM3
-#define CONFIG_SYS_CSPR3_EXT           CONFIG_SYS_FPGA_CSPR_EXT
-#define CONFIG_SYS_CSPR3               CONFIG_SYS_FPGA_CSPR
-#define CONFIG_SYS_CSPR3_FINAL         SYS_FPGA_CSPR_FINAL
-#define CONFIG_SYS_AMASK3              SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR3               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS3_FTIM0           SYS_FPGA_CS_FTIM0
-#define CONFIG_SYS_CS3_FTIM1           SYS_FPGA_CS_FTIM1
-#define CONFIG_SYS_CS3_FTIM2           SYS_FPGA_CS_FTIM2
-#define CONFIG_SYS_CS3_FTIM3           SYS_FPGA_CS_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
+#define CFG_SYS_CSPR1_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR1_CSPR_EARLY
+#define CFG_SYS_CSPR1_FINAL            CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK1         CFG_SYS_NOR_AMASK_EARLY
+#define CFG_SYS_AMASK1_FINAL           CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR1          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS1_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS1_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS1_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS1_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR2_EXT              CFG_SYS_NAND_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NAND_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NAND_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NAND_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NAND_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NAND_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NAND_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NAND_FTIM3
+#define CFG_SYS_CSPR3_EXT              CFG_SYS_FPGA_CSPR_EXT
+#define CFG_SYS_CSPR3          CFG_SYS_FPGA_CSPR
+#define CFG_SYS_CSPR3_FINAL            SYS_FPGA_CSPR_FINAL
+#define CFG_SYS_AMASK3         SYS_FPGA_AMASK
+#define CFG_SYS_CSOR3          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS3_FTIM0              SYS_FPGA_CS_FTIM0
+#define CFG_SYS_CS3_FTIM1              SYS_FPGA_CS_FTIM1
+#define CFG_SYS_CS3_FTIM2              SYS_FPGA_CS_FTIM2
+#define CFG_SYS_CS3_FTIM3              SYS_FPGA_CS_FTIM3
 #endif
 #endif
 
-#define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
+#define CFG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
 
 /*
  * I2C bus multiplexer
@@ -316,55 +271,24 @@ unsigned long get_board_ddr_clk(void);
 #define I2C_VOL_MONITOR_BUS_V_SHIFT    3
 #define I2C_SVDD_MONITOR_ADDR           0x4F
 
-#define CONFIG_VID_FLS_ENV              "ls1088aqds_vdd_mv"
-#define CONFIG_VID
-
 /* The lowest and highest voltage allowed for LS1088AQDS */
 #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
 
 /*
 * RTC configuration
 */
 #define RTC
-#define CONFIG_SYS_I2C_RTC_ADDR         0x51  /* Channel 3*/
-
-/* 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
+#define CFG_SYS_I2C_RTC_ADDR         0x51  /* Channel 3*/
 
 #ifdef CONFIG_FSL_DSPI
-#define CONFIG_SPI_FLASH_STMICRO
-#define CONFIG_SPI_FLASH_SST
-#define CONFIG_SPI_FLASH_EON
 #if !defined(CONFIG_TFABOOT) && \
        !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
 #endif
 #endif
 
-#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
-
-/*  MMC  */
-#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
-#define CONFIG_ESDHC_DETECT_QUIRK ((readb(QIXIS_BASE + QIXIS_STAT_PRES1) & \
-       QIXIS_SDID_MASK) != QIXIS_ESDHC_NO_ADAPTER)
-
 #define COMMON_ENV \
        "kernelheader_addr_r=0x80200000\0"      \
        "fdtheader_addr_r=0x80100000\0"         \
@@ -387,7 +311,7 @@ unsigned long get_board_ddr_clk(void);
        "kernel_start=0x1000000\0"              \
        "kernel_load=0xa0000000\0"              \
        "kernel_size=0x2800000\0"               \
-       "mcinitcmd=sf probe 0:0;sf read 0xa0a00000 0xa00000 0x100000;"  \
+       "mcinitcmd=sf probe 0:0;sf read 0xa0a00000 0xa00000 0x200000;"  \
        "sf read 0xa0640000 0x640000 0x4000; esbc_validate 0xa0640000;" \
        "sf read 0xa0e00000 0xe00000 0x100000;" \
        "sf read 0xa0680000 0x680000 0x4000;esbc_validate 0xa0680000;"  \
@@ -396,13 +320,13 @@ unsigned long get_board_ddr_clk(void);
 #else /* if !(CONFIG_NXP_ESBC) */
 #ifdef CONFIG_TFABOOT
 #define QSPI_MC_INIT_CMD                               \
-       "sf probe 0:0;sf read 0x80000000 0xA00000 0x100000;"    \
-       "sf read 0x80100000 0xE00000 0x100000;" \
-       "fsl_mc start mc 0x80000000 0x80100000\0"
+       "sf probe 0:0;sf read 0x80a00000 0xA00000 0x200000;"    \
+       "sf read 0x80e00000 0xE00000 0x100000;" \
+       "fsl_mc start mc 0x80a00000 0x80e00000\0"
 #define SD_MC_INIT_CMD                         \
-       "mmcinfo;mmc read 0x80000000 0x5000 0x800;"  \
-       "mmc read 0x80100000 0x7000 0x800;" \
-       "fsl_mc start mc 0x80000000 0x80100000\0"
+       "mmcinfo;mmc read 0x80a00000 0x5000 0x1000;"  \
+       "mmc read 0x80e00000 0x7000 0x800;" \
+       "fsl_mc start mc 0x80a00000 0x80e00000\0"
 #define IFC_MC_INIT_CMD                                \
        "fsl_mc start mc 0x580A00000 0x580E00000\0"
 
@@ -422,9 +346,9 @@ unsigned long get_board_ddr_clk(void);
        "kernel_load=0xa0000000\0"              \
        "kernel_size=0x2800000\0"               \
        "kernel_size_sd=0x14000\0"               \
-       "mcinitcmd=sf probe 0:0;sf read 0x80000000 0xA00000 0x100000;"  \
-       "sf read 0x80100000 0xE00000 0x100000;" \
-       "fsl_mc start mc 0x80000000 0x80100000\0"       \
+       "mcinitcmd=sf probe 0:0;sf read 0x80a00000 0xA00000 0x200000;"  \
+       "sf read 0x80e00000 0xE00000 0x100000;" \
+       "fsl_mc start mc 0x80a00000 0x80e00000\0"       \
        "mcmemsize=0x70000000 \0"               \
        "BOARD=ls1088aqds\0" \
        "scriptaddr=0x80000000\0"               \
@@ -481,9 +405,9 @@ unsigned long get_board_ddr_clk(void);
        "kernel_start=0x1000000\0"              \
        "kernel_load=0xa0000000\0"              \
        "kernel_size=0x2800000\0"               \
-       "mcinitcmd=sf probe 0:0;sf read 0x80000000 0xA00000 0x100000;"  \
-       "sf read 0x80100000 0xE00000 0x100000;" \
-       "fsl_mc start mc 0x80000000 0x80100000\0"       \
+       "mcinitcmd=sf probe 0:0;sf read 0x80a00000 0xA00000 0x200000;"  \
+       "sf read 0x80e00000 0xE00000 0x100000;" \
+       "fsl_mc start mc 0x80a00000 0x80e00000\0"       \
        "mcmemsize=0x70000000 \0"
 #elif defined(CONFIG_SD_BOOT)
 #undef CONFIG_EXTRA_ENV_SETTINGS
@@ -499,9 +423,9 @@ unsigned long get_board_ddr_clk(void);
        "kernel_start=0x8000\0"              \
        "kernel_load=0xa0000000\0"              \
        "kernel_size=0x14000\0"               \
-       "mcinitcmd=mmcinfo;mmc read 0x80000000 0x5000 0x800;"  \
-       "mmc read 0x80100000 0x7000 0x800;" \
-       "fsl_mc start mc 0x80000000 0x80100000\0"       \
+       "mcinitcmd=mmcinfo;mmc read 0x80a00000 0x5000 0x1000;"  \
+       "mmc read 0x80e00000 0x7000 0x800;" \
+       "fsl_mc start mc 0x80a00000 0x80e00000\0"       \
        "mcmemsize=0x70000000 \0"
 #else  /* NOR BOOT */
 #undef CONFIG_EXTRA_ENV_SETTINGS
@@ -533,7 +457,6 @@ unsigned long get_board_ddr_clk(void);
 #endif
 
 #ifdef CONFIG_FSL_MC_ENET
-#define CONFIG_FSL_MEMAC
 #define RGMII_PHY1_ADDR                0x1
 #define RGMII_PHY2_ADDR                0x2
 #define SGMII_CARD_PORT1_PHY_ADDR 0x1C
@@ -558,9 +481,6 @@ unsigned long get_board_ddr_clk(void);
 #define XQSGMII_CARD_PHY4_PORT2_ADDR 0xe
 #define XQSGMII_CARD_PHY4_PORT3_ADDR 0xf
 
-#define CONFIG_ETHPRIME                "DPMAC1@xgmii"
-#define CONFIG_PHY_GIGE                /* Include GbE speed/duplex detection */
-
 #endif
 
 #define BOOT_TARGET_DEVICES(func) \