global: Remove unused CONFIG symbols
[platform/kernel/u-boot.git] / include / configs / ls1046aqds.h
index 434a5e1..c4e5f49 100644 (file)
@@ -8,13 +8,9 @@
 
 #include "ls1046a_common.h"
 
-#define CONFIG_LAYERSCAPE_NS_ACCESS
-
-#define CONFIG_DIMM_SLOTS_PER_CTLR     1
 /* Physical Memory Map */
 
 #define SPD_EEPROM_ADDRESS             0x51
-#define CONFIG_SYS_SPD_BUS_NUM         0
 
 #ifdef CONFIG_DDR_ECC
 #define CONFIG_MEM_INIT_VALUE           0xdeadbeef
 /* IFC */
 #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
 /*
- * CONFIG_SYS_FLASH_BASE has the final address (core view)
- * CONFIG_SYS_FLASH_BASE_PHYS has the final address (IFC view)
- * CONFIG_SYS_FLASH_BASE_PHYS_EARLY has the temporary IFC address
- * CONFIG_SYS_TEXT_BASE is linked to 0x60000000 for booting
+ * CFG_SYS_FLASH_BASE has the final address (core view)
+ * CFG_SYS_FLASH_BASE_PHYS has the final address (IFC view)
+ * CFG_SYS_FLASH_BASE_PHYS_EARLY has the temporary IFC address
+ * CONFIG_TEXT_BASE is linked to 0x60000000 for booting
  */
-#define CONFIG_SYS_FLASH_BASE                  0x60000000
-#define CONFIG_SYS_FLASH_BASE_PHYS             CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_FLASH_BASE_PHYS_EARLY       0x00000000
-
-#ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_SYS_FLASH_QUIET_TEST
-#define CONFIG_FLASH_SHOW_PROGRESS     45      /* count down from 45/5: 9..1 */
-#endif
+#define CFG_SYS_FLASH_BASE                     0x60000000
+#define CFG_SYS_FLASH_BASE_PHYS                CFG_SYS_FLASH_BASE
+#define CFG_SYS_FLASH_BASE_PHYS_EARLY  0x00000000
 #endif
 
 /* LPUART */
 #define CFG_LPUART_EN          0x2
 #endif
 
-/* EEPROM */
-#define CONFIG_SYS_I2C_EEPROM_NXID
-#define CONFIG_SYS_EEPROM_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_NOR0_CSPR   (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | \
+#define CFG_SYS_NOR0_CSPR_EXT  (0x0)
+#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_NOR1_CSPR_EXT       (0x0)
-#define CONFIG_SYS_NOR1_CSPR   (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS \
+#define CFG_SYS_NOR1_CSPR_EXT  (0x0)
+#define CFG_SYS_NOR1_CSPR      (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS \
                                + 0x8000000) | \
                                CSPR_PORT_SIZE_16 | \
                                CSPR_MSEL_NOR | \
                                CSPR_V)
-#define CONFIG_SYS_NOR_AMASK           IFC_AMASK(128 * 1024 * 1024)
+#define CFG_SYS_NOR_AMASK              IFC_AMASK(128 * 1024 * 1024)
 
-#define CONFIG_SYS_NOR_CSOR            (CSOR_NOR_ADM_SHIFT(4) | \
+#define CFG_SYS_NOR_CSOR               (CSOR_NOR_ADM_SHIFT(4) | \
                                        CSOR_NOR_TRHZ_80)
-#define CONFIG_SYS_NOR_FTIM0           (FTIM0_NOR_TACSE(0x4) | \
+#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           0
-
-#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 CFG_SYS_NOR_FTIM3              0
 
-#define CONFIG_SYS_FLASH_EMPTY_INFO
-#define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS, \
-                                       CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000}
+#define CFG_SYS_FLASH_BANKS_LIST       {CFG_SYS_FLASH_BASE_PHYS, \
+                                       CFG_SYS_FLASH_BASE_PHYS + 0x8000000}
 
-#define CONFIG_SYS_WRITE_SWAPPED_DATA
+#define CFG_SYS_WRITE_SWAPPED_DATA
 
 /*
  * NAND Flash Definitions
  */
 
-#define CONFIG_SYS_NAND_BASE           0x7e800000
-#define CONFIG_SYS_NAND_BASE_PHYS      CONFIG_SYS_NAND_BASE
+#define CFG_SYS_NAND_BASE              0x7e800000
+#define CFG_SYS_NAND_BASE_PHYS CFG_SYS_NAND_BASE
 
-#define CONFIG_SYS_NAND_CSPR_EXT       (0x0)
+#define CFG_SYS_NAND_CSPR_EXT  (0x0)
 
-#define CONFIG_SYS_NAND_CSPR   (CSPR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \
+#define CFG_SYS_NAND_CSPR      (CSPR_PHYS_ADDR(CFG_SYS_NAND_BASE_PHYS) \
                                | CSPR_PORT_SIZE_8      \
                                | CSPR_MSEL_NAND        \
                                | CSPR_V)
-#define CONFIG_SYS_NAND_AMASK  IFC_AMASK(64*1024)
-#define CONFIG_SYS_NAND_CSOR   (CSOR_NAND_ECC_ENC_EN   /* ECC on encode */ \
+#define CFG_SYS_NAND_AMASK     IFC_AMASK(64*1024)
+#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_8  /* 8-bit ECC */ \
                                | CSOR_NAND_RAL_3       /* RAL = 3 Bytes */ \
                                | CSOR_NAND_SPRZ_224    /* Spare size = 224 */ \
                                | CSOR_NAND_PB(64))     /* 64 Pages Per Block */
 
-#define CONFIG_SYS_NAND_FTIM0          (FTIM0_NAND_TCCST(0x7) | \
+#define CFG_SYS_NAND_FTIM0             (FTIM0_NAND_TCCST(0x7) | \
                                        FTIM0_NAND_TWP(0x18)   | \
                                        FTIM0_NAND_TWCHT(0x7) | \
                                        FTIM0_NAND_TWH(0xa))
-#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(0xe)   | \
                                        FTIM1_NAND_TRP(0x18))
-#define CONFIG_SYS_NAND_FTIM2          (FTIM2_NAND_TRAD(0xf) | \
+#define CFG_SYS_NAND_FTIM2             (FTIM2_NAND_TRAD(0xf) | \
                                        FTIM2_NAND_TREH(0xa) | \
                                        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 CONFIG_MTD_NAND_VERIFY_WRITE
+#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE }
 #endif
 
 #ifdef CONFIG_NAND_BOOT
-#define CONFIG_SPL_PAD_TO              0x40000         /* block aligned */
-#define CONFIG_SYS_NAND_U_BOOT_SIZE    (768 << 10)
+#define CFG_SYS_NAND_U_BOOT_SIZE       (768 << 10)
 #endif
 
 #if defined(CONFIG_TFABOOT) || \
        defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
-#define CONFIG_QIXIS_I2C_ACCESS
 #endif
 
 /*
  * QIXIS Definitions
  */
-#define CONFIG_FSL_QIXIS
 
 #ifdef CONFIG_FSL_QIXIS
 #define QIXIS_BASE                     0x7fb00000
 #define QIXIS_BASE_PHYS                        QIXIS_BASE
-#define CONFIG_SYS_I2C_FPGA_ADDR       0x66
+#define CFG_SYS_I2C_FPGA_ADDR  0x66
 #define QIXIS_LBMAP_SWITCH             6
 #define QIXIS_LBMAP_MASK               0x0f
 #define QIXIS_LBMAP_SHIFT              0
 #define QIXIS_RCFG_CTL_RECONFIG_START  0x21
 #define QIXIS_RCFG_CTL_WATCHDOG_ENBLE  0x08
 
-#define CONFIG_SYS_FPGA_CSPR_EXT       (0x0)
-#define CONFIG_SYS_FPGA_CSPR           (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS) | \
+#define CFG_SYS_FPGA_CSPR_EXT  (0x0)
+#define CFG_SYS_FPGA_CSPR              (CSPR_PHYS_ADDR(QIXIS_BASE_PHYS) | \
                                        CSPR_PORT_SIZE_8 | \
                                        CSPR_MSEL_GPCM | \
                                        CSPR_V)
-#define CONFIG_SYS_FPGA_AMASK          IFC_AMASK(64 * 1024)
-#define CONFIG_SYS_FPGA_CSOR           (CSOR_NOR_ADM_SHIFT(4) | \
+#define CFG_SYS_FPGA_AMASK             IFC_AMASK(64 * 1024)
+#define CFG_SYS_FPGA_CSOR              (CSOR_NOR_ADM_SHIFT(4) | \
                                        CSOR_NOR_NOR_MODE_AVD_NOR | \
                                        CSOR_NOR_TRHZ_80)
 
 /*
  * QIXIS Timing parameters for IFC GPCM
  */
-#define CONFIG_SYS_FPGA_FTIM0          (FTIM0_GPCM_TACSE(0xc) | \
+#define CFG_SYS_FPGA_FTIM0             (FTIM0_GPCM_TACSE(0xc) | \
                                        FTIM0_GPCM_TEADC(0x20) | \
                                        FTIM0_GPCM_TEAHC(0x10))
-#define CONFIG_SYS_FPGA_FTIM1          (FTIM1_GPCM_TACO(0x50) | \
+#define CFG_SYS_FPGA_FTIM1             (FTIM1_GPCM_TACO(0x50) | \
                                        FTIM1_GPCM_TRAD(0x1f))
-#define CONFIG_SYS_FPGA_FTIM2          (FTIM2_GPCM_TCS(0x8) | \
+#define CFG_SYS_FPGA_FTIM2             (FTIM2_GPCM_TCS(0x8) | \
                                        FTIM2_GPCM_TCH(0x8) | \
                                        FTIM2_GPCM_TWP(0xf0))
-#define CONFIG_SYS_FPGA_FTIM3          0x0
+#define CFG_SYS_FPGA_FTIM3             0x0
 #endif
 
 #ifdef CONFIG_TFABOOT
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               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_NOR1_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              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_AMASK3              CONFIG_SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR3               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS3_FTIM0           CONFIG_SYS_FPGA_FTIM0
-#define CONFIG_SYS_CS3_FTIM1           CONFIG_SYS_FPGA_FTIM1
-#define CONFIG_SYS_CS3_FTIM2           CONFIG_SYS_FPGA_FTIM2
-#define CONFIG_SYS_CS3_FTIM3           CONFIG_SYS_FPGA_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          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_NOR1_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK1         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_AMASK3         CFG_SYS_FPGA_AMASK
+#define CFG_SYS_CSOR3          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS3_FTIM0              CFG_SYS_FPGA_FTIM0
+#define CFG_SYS_CS3_FTIM1              CFG_SYS_FPGA_FTIM1
+#define CFG_SYS_CS3_FTIM2              CFG_SYS_FPGA_FTIM2
+#define CFG_SYS_CS3_FTIM3              CFG_SYS_FPGA_FTIM3
 #else
 #ifdef CONFIG_NAND_BOOT
-#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_CSPR1_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR0_CSPR
-#define CONFIG_SYS_AMASK1              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_NOR1_CSPR_EXT
-#define CONFIG_SYS_CSPR2               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK2              CONFIG_SYS_NOR_AMASK
-#define CONFIG_SYS_CSOR2               CONFIG_SYS_NOR_CSOR
-#define CONFIG_SYS_CS2_FTIM0           CONFIG_SYS_NOR_FTIM0
-#define CONFIG_SYS_CS2_FTIM1           CONFIG_SYS_NOR_FTIM1
-#define CONFIG_SYS_CS2_FTIM2           CONFIG_SYS_NOR_FTIM2
-#define CONFIG_SYS_CS2_FTIM3           CONFIG_SYS_NOR_FTIM3
-#define CONFIG_SYS_CSPR3_EXT           CONFIG_SYS_FPGA_CSPR_EXT
-#define CONFIG_SYS_CSPR3               CONFIG_SYS_FPGA_CSPR
-#define CONFIG_SYS_AMASK3              CONFIG_SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR3               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS3_FTIM0           CONFIG_SYS_FPGA_FTIM0
-#define CONFIG_SYS_CS3_FTIM1           CONFIG_SYS_FPGA_FTIM1
-#define CONFIG_SYS_CS3_FTIM2           CONFIG_SYS_FPGA_FTIM2
-#define CONFIG_SYS_CS3_FTIM3           CONFIG_SYS_FPGA_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_CSPR1_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR0_CSPR
+#define CFG_SYS_AMASK1         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_NOR1_CSPR_EXT
+#define CFG_SYS_CSPR2          CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK2         CFG_SYS_NOR_AMASK
+#define CFG_SYS_CSOR2          CFG_SYS_NOR_CSOR
+#define CFG_SYS_CS2_FTIM0              CFG_SYS_NOR_FTIM0
+#define CFG_SYS_CS2_FTIM1              CFG_SYS_NOR_FTIM1
+#define CFG_SYS_CS2_FTIM2              CFG_SYS_NOR_FTIM2
+#define CFG_SYS_CS2_FTIM3              CFG_SYS_NOR_FTIM3
+#define CFG_SYS_CSPR3_EXT              CFG_SYS_FPGA_CSPR_EXT
+#define CFG_SYS_CSPR3          CFG_SYS_FPGA_CSPR
+#define CFG_SYS_AMASK3         CFG_SYS_FPGA_AMASK
+#define CFG_SYS_CSOR3          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS3_FTIM0              CFG_SYS_FPGA_FTIM0
+#define CFG_SYS_CS3_FTIM1              CFG_SYS_FPGA_FTIM1
+#define CFG_SYS_CS3_FTIM2              CFG_SYS_FPGA_FTIM2
+#define CFG_SYS_CS3_FTIM3              CFG_SYS_FPGA_FTIM3
 #else
-#define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
-#define CONFIG_SYS_CSPR0               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_NOR1_CSPR_EXT
-#define CONFIG_SYS_CSPR1               CONFIG_SYS_NOR1_CSPR
-#define CONFIG_SYS_AMASK1              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_AMASK3              CONFIG_SYS_FPGA_AMASK
-#define CONFIG_SYS_CSOR3               CONFIG_SYS_FPGA_CSOR
-#define CONFIG_SYS_CS3_FTIM0           CONFIG_SYS_FPGA_FTIM0
-#define CONFIG_SYS_CS3_FTIM1           CONFIG_SYS_FPGA_FTIM1
-#define CONFIG_SYS_CS3_FTIM2           CONFIG_SYS_FPGA_FTIM2
-#define CONFIG_SYS_CS3_FTIM3           CONFIG_SYS_FPGA_FTIM3
+#define CFG_SYS_CSPR0_EXT              CFG_SYS_NOR0_CSPR_EXT
+#define CFG_SYS_CSPR0          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_NOR1_CSPR_EXT
+#define CFG_SYS_CSPR1          CFG_SYS_NOR1_CSPR
+#define CFG_SYS_AMASK1         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_AMASK3         CFG_SYS_FPGA_AMASK
+#define CFG_SYS_CSOR3          CFG_SYS_FPGA_CSOR
+#define CFG_SYS_CS3_FTIM0              CFG_SYS_FPGA_FTIM0
+#define CFG_SYS_CS3_FTIM1              CFG_SYS_FPGA_FTIM1
+#define CFG_SYS_CS3_FTIM2              CFG_SYS_FPGA_FTIM2
+#define CFG_SYS_CS3_FTIM3              CFG_SYS_FPGA_FTIM3
 #endif
 #endif
 
  * Miscellaneous configurable options
  */
 
-#define CONFIG_SYS_INIT_SP_OFFSET \
-       (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-
 /*
  * Environment
  */