global: Move remaining CONFIG_SYS_NAND_* to CFG_SYS_NAND_*
[platform/kernel/u-boot.git] / include / configs / ls2080ardb.h
index 49c2cc5..086c469 100644 (file)
@@ -9,24 +9,9 @@
 
 #include "ls2080a_common.h"
 
-#ifdef CONFIG_FSL_QSPI
-#ifdef CONFIG_TARGET_LS2081ARDB
-#define CONFIG_QIXIS_I2C_ACCESS
-#endif
-#if !CONFIG_IS_ENABLED(DM_I2C)
-#define CONFIG_SYS_I2C_EARLY_INIT
-#endif
-#endif
-
 #define I2C_MUX_CH_VOL_MONITOR         0xa
 #define I2C_VOL_MONITOR_ADDR           0x38
-#define CONFIG_VOL_MONITOR_IR36021_READ
-#define CONFIG_VOL_MONITOR_IR36021_SET
 
-#define CONFIG_VID_FLS_ENV             "ls2080ardb_vdd_mv"
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_VID
-#endif
 /* step the IR regulator in 5mV increments */
 #define IR_VDD_STEP_DOWN               5
 #define IR_VDD_STEP_UP                 5
 #define VDD_MV_MIN                     819
 #define VDD_MV_MAX                     1212
 
-#ifndef __ASSEMBLY__
-unsigned long get_board_sys_clk(void);
-#endif
-
-#define CONFIG_SYS_CLK_FREQ            get_board_sys_clk()
-#define CONFIG_DDR_CLK_FREQ            133333333
-#define COUNTER_FREQUENCY_REAL         (CONFIG_SYS_CLK_FREQ/4)
+#define COUNTER_FREQUENCY_REAL         (get_board_sys_clk()/4)
 
-#define CONFIG_DDR_SPD
-#define CONFIG_DDR_ECC
-#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER
 #define CONFIG_MEM_INIT_VALUE          0xdeadbeef
 #define SPD_EEPROM_ADDRESS1    0x51
 #define SPD_EEPROM_ADDRESS2    0x52
@@ -53,23 +29,6 @@ unsigned long get_board_sys_clk(void);
 #define SPD_EEPROM_ADDRESS5    0x55
 #define SPD_EEPROM_ADDRESS6    0x56    /* dummy address */
 #define SPD_EEPROM_ADDRESS     SPD_EEPROM_ADDRESS1
-#define CONFIG_SYS_SPD_BUS_NUM 0       /* SPD on I2C bus 0 */
-#define CONFIG_DIMM_SLOTS_PER_CTLR             2
-#define CONFIG_CHIP_SELECTS_PER_CTRL           4
-#ifdef CONFIG_SYS_FSL_HAS_DP_DDR
-#define CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR      1
-#endif
-
-/* SATA */
-#define CONFIG_SCSI_AHCI_PLAT
-
-#define CONFIG_SYS_SATA1                       AHCI_BASE_ADDR1
-#define CONFIG_SYS_SATA2                       AHCI_BASE_ADDR2
-
-#define CONFIG_SYS_SCSI_MAX_SCSI_ID            1
-#define CONFIG_SYS_SCSI_MAX_LUN                        1
-#define CONFIG_SYS_SCSI_MAX_DEVICE             (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
-                                               CONFIG_SYS_SCSI_MAX_LUN)
 
 #if !defined(CONFIG_FSL_QSPI) || defined(CONFIG_TFABOOT)
 
@@ -102,31 +61,20 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_SYS_IFC_CCR     0x01000000
 
 #ifdef CONFIG_MTD_NOR_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,\
                                         CONFIG_SYS_FLASH_BASE + 0x40000000}
 #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 */ \
@@ -134,28 +82,23 @@ unsigned long get_board_sys_clk(void);
                                | CSOR_NAND_SPRZ_224    /* Spare size = 224 */ \
                                | CSOR_NAND_PB(128))    /* Pages Per Block 128*/
 
-#define CONFIG_SYS_NAND_ONFI_DETECTION
-
 /* ONFI NAND Flash mode0 Timing Params */
-#define CONFIG_SYS_NAND_FTIM0          (FTIM0_NAND_TCCST(0x0e) | \
+#define CFG_SYS_NAND_FTIM0             (FTIM0_NAND_TCCST(0x0e) | \
                                        FTIM0_NAND_TWP(0x30)   | \
                                        FTIM0_NAND_TWCHT(0x0e) | \
                                        FTIM0_NAND_TWH(0x14))
-#define CONFIG_SYS_NAND_FTIM1          (FTIM1_NAND_TADLE(0x64) | \
+#define CFG_SYS_NAND_FTIM1             (FTIM1_NAND_TADLE(0x64) | \
                                        FTIM1_NAND_TWBE(0xab)  | \
                                        FTIM1_NAND_TRR(0x1c)   | \
                                        FTIM1_NAND_TRP(0x30))
-#define CONFIG_SYS_NAND_FTIM2          (FTIM2_NAND_TRAD(0x1e) | \
+#define CFG_SYS_NAND_FTIM2             (FTIM2_NAND_TRAD(0x1e) | \
                                        FTIM2_NAND_TREH(0x14) | \
                                        FTIM2_NAND_TWHRE(0x3c))
-#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     (512 * 1024)
-#define CONFIG_FSL_QIXIS       /* use common QIXIS code */
 #define QIXIS_LBMAP_SWITCH             0x06
 #define QIXIS_LBMAP_MASK               0x0f
 #define QIXIS_LBMAP_SHIFT              0
@@ -203,18 +146,16 @@ unsigned long get_board_sys_clk(void);
 #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_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_SPL_PAD_TO              0x80000
-#define CONFIG_SYS_NAND_U_BOOT_OFFS    (1024 * 1024)
-#define CONFIG_SYS_NAND_U_BOOT_SIZE    (512 * 1024)
+#define CONFIG_SYS_CSPR0_EXT           CFG_SYS_NAND_CSPR_EXT
+#define CONFIG_SYS_CSPR0               CFG_SYS_NAND_CSPR
+#define CONFIG_SYS_AMASK0              CFG_SYS_NAND_AMASK
+#define CONFIG_SYS_CSOR0               CFG_SYS_NAND_CSOR
+#define CONFIG_SYS_CS0_FTIM0           CFG_SYS_NAND_FTIM0
+#define CONFIG_SYS_CS0_FTIM1           CFG_SYS_NAND_FTIM1
+#define CONFIG_SYS_CS0_FTIM2           CFG_SYS_NAND_FTIM2
+#define CONFIG_SYS_CS0_FTIM3           CFG_SYS_NAND_FTIM3
+
+#define CFG_SYS_NAND_U_BOOT_SIZE       (512 * 1024)
 #else
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR0               CONFIG_SYS_NOR0_CSPR_EARLY
@@ -225,24 +166,19 @@ unsigned long get_board_sys_clk(void);
 #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_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_CSPR2_EXT           CFG_SYS_NAND_CSPR_EXT
+#define CONFIG_SYS_CSPR2               CFG_SYS_NAND_CSPR
+#define CONFIG_SYS_AMASK2              CFG_SYS_NAND_AMASK
+#define CONFIG_SYS_CSOR2               CFG_SYS_NAND_CSOR
+#define CONFIG_SYS_CS2_FTIM0           CFG_SYS_NAND_FTIM0
+#define CONFIG_SYS_CS2_FTIM1           CFG_SYS_NAND_FTIM1
+#define CONFIG_SYS_CS2_FTIM2           CFG_SYS_NAND_FTIM2
+#define CONFIG_SYS_CS2_FTIM3           CFG_SYS_NAND_FTIM3
 #endif
-
-/* Debug Server firmware */
-#define CONFIG_SYS_DEBUG_SERVER_FW_IN_NOR
-#define CONFIG_SYS_DEBUG_SERVER_FW_ADDR        0x580D00000ULL
 #endif
 #define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
 
 #ifdef CONFIG_TARGET_LS2081ARDB
-#define CONFIG_FSL_QIXIS       /* use common QIXIS code */
 #define QIXIS_QMAP_MASK                        0x07
 #define QIXIS_QMAP_SHIFT               5
 #define QIXIS_LBMAP_DFLTBANK           0x00
@@ -270,9 +206,6 @@ unsigned long get_board_sys_clk(void);
 #define I2C_MUX_CH_DEFAULT      0x8
 
 /* SPI */
-#if defined(CONFIG_FSL_DSPI)
-#define CONFIG_SPI_FLASH_STMICRO
-#endif
 
 /*
  * RTC configuration
@@ -285,21 +218,6 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_SYS_I2C_RTC_ADDR         0x68
 #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
-
-#define CONFIG_FSL_MEMAC
-
-#ifdef CONFIG_PCI
-#define CONFIG_PCI_SCAN_SHOW
-#endif
-
 #define BOOT_TARGET_DEVICES(func) \
        func(USB, usb, 0) \
        func(MMC, mmc, 0) \
@@ -371,7 +289,6 @@ unsigned long get_board_sys_clk(void);
        "ramdisk_size=0x2000000\0"              \
        "fdt_high=0xa0000000\0"                 \
        "initrd_high=0xffffffffffffffff\0"      \
-       "fdt_addr=0x64f00000\0"                 \
        "kernel_addr=0x581000000\0"             \
        "kernel_start=0x1000000\0"              \
        "kernelheader_start=0x800000\0"         \
@@ -434,7 +351,6 @@ unsigned long get_board_sys_clk(void);
        "ramdisk_size=0x2000000\0"              \
        "fdt_high=0xa0000000\0"                 \
        "initrd_high=0xffffffffffffffff\0"      \
-       "fdt_addr=0x64f00000\0"                 \
        "kernel_addr=0x581000000\0"             \
        "kernel_start=0x1000000\0"              \
        "kernelheader_start=0x600000\0"         \
@@ -524,50 +440,16 @@ unsigned long get_board_sys_clk(void);
                        "run distro_bootcmd;run nor_bootcmd; "          \
                        "env exists secureboot && esbc_halt;"
 #else
-#undef CONFIG_BOOTCOMMAND
 #ifdef CONFIG_QSPI_BOOT
 /* Try to boot an on-QSPI kernel first, then do normal distro boot */
-#define CONFIG_BOOTCOMMAND                                             \
-                       "sf probe 0:0; "                                \
-                       "sf read 0x806c0000 0x6c0000 0x40000; "         \
-                       "env exists mcinitcmd && env exists secureboot "\
-                       "&& esbc_validate 0x806C0000; "                 \
-                       "sf read 0x80d00000 0xd00000 0x100000; "        \
-                       "env exists mcinitcmd && "                      \
-                       "fsl_mc lazyapply dpl 0x80d00000; "             \
-                       "run distro_bootcmd;run qspi_bootcmd; "         \
-                       "env exists secureboot && esbc_halt;"
 #elif defined(CONFIG_SD_BOOT)
 /* Try to boot an on-SD kernel first, then do normal distro boot */
-#define CONFIG_BOOTCOMMAND                                             \
-                       "env exists mcinitcmd && env exists secureboot "\
-                       "&& mmcinfo && mmc read $load_addr 0x3600 0x800 " \
-                       "&& esbc_validate $load_addr; "                 \
-                       "env exists mcinitcmd && run mcinitcmd "        \
-                       "&& mmc read 0x88000000 0x6800 0x800 "          \
-                       "&& fsl_mc lazyapply dpl 0x88000000; "          \
-                       "run distro_bootcmd;run sd_bootcmd; "           \
-                       "env exists secureboot && esbc_halt;"
 #else
 /* Try to boot an on-NOR kernel first, then do normal distro boot */
-#define CONFIG_BOOTCOMMAND                                             \
-                       "env exists mcinitcmd && env exists secureboot "\
-                       "&& esbc_validate 0x5806C0000; env exists mcinitcmd "\
-                       "&& fsl_mc lazyapply dpl 0x580d00000;"          \
-                       "run distro_bootcmd;run nor_bootcmd; "          \
-                       "env exists secureboot && esbc_halt;"
 #endif
 #endif
 
 /* MAC/PHY configuration */
-#ifdef CONFIG_FSL_MC_ENET
-#ifdef CONFIG_QSPI_BOOT
-#define CONFIG_CORTINA_FW_ADDR         0x20980000
-#else
-#define CONFIG_CORTINA_FW_ADDR         0x580980000
-#endif
-#define CONFIG_CORTINA_FW_LENGTH       0x40000
-
 #define CORTINA_PHY_ADDR1      0x10
 #define CORTINA_PHY_ADDR2      0x11
 #define CORTINA_PHY_ADDR3      0x12
@@ -578,9 +460,6 @@ unsigned long get_board_sys_clk(void);
 #define AQ_PHY_ADDR4           0x03
 #define AQR405_IRQ_MASK                0x36
 
-#define CONFIG_ETHPRIME                "DPMAC1@xgmii"
-#endif
-
 #include <asm/fsl_secure_boot.h>
 
 #endif /* __LS2_RDB_H */