projects / platform / kernel / u-boot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig
[platform/kernel/u-boot.git] / include / configs / ls2080ardb.h
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 926239a..674d27f 100644 (file)
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2017, 2019 NXP
+ * Copyright 2017, 2019-2021 NXP
  * Copyright 2015 Freescale Semiconductor
  */
 
@@ -13,9 +13,6 @@
 #ifdef CONFIG_TARGET_LS2081ARDB
 #define CONFIG_QIXIS_I2C_ACCESS
 #endif
-#ifndef CONFIG_DM_I2C
-#define CONFIG_SYS_I2C_EARLY_INIT
-#endif
 #endif
 
 #define I2C_MUX_CH_VOL_MONITOR         0xa
@@ -39,12 +36,8 @@ 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 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
@@ -70,9 +63,6 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_SYS_SCSI_MAX_LUN                        1
 #define CONFIG_SYS_SCSI_MAX_DEVICE             (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
                                                CONFIG_SYS_SCSI_MAX_LUN)
-#ifdef CONFIG_TFABOOT
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#endif
 
 #if !defined(CONFIG_FSL_QSPI) || defined(CONFIG_TFABOOT)
 
@@ -118,7 +108,6 @@ unsigned long get_board_sys_clk(void);
                                         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
 
@@ -137,8 +126,6 @@ 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) | \
                                        FTIM0_NAND_TWP(0x30)   | \
@@ -157,7 +144,6 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #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
@@ -196,7 +182,7 @@ unsigned long get_board_sys_clk(void);
                                        FTIM2_GPCM_TWP(0x3E))
 #define CONFIG_SYS_CS3_FTIM3           0x0
 
-#if defined(CONFIG_SPL) && defined(CONFIG_NAND)
+#if defined(CONFIG_SPL) && defined(CONFIG_MTD_RAW_NAND)
 #define CONFIG_SYS_CSPR2_EXT           CONFIG_SYS_NOR0_CSPR_EXT
 #define CONFIG_SYS_CSPR2               CONFIG_SYS_NOR0_CSPR_EARLY
 #define CONFIG_SYS_CSPR2_FINAL         CONFIG_SYS_NOR0_CSPR
@@ -216,7 +202,6 @@ unsigned long get_board_sys_clk(void);
 #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)
 #else
 #define CONFIG_SYS_CSPR0_EXT           CONFIG_SYS_NOR0_CSPR_EXT
@@ -273,20 +258,15 @@ unsigned long get_board_sys_clk(void);
 #define I2C_MUX_CH_DEFAULT      0x8
 
 /* SPI */
-#if defined(CONFIG_FSL_QSPI) || defined(CONFIG_FSL_DSPI)
-#ifdef CONFIG_FSL_DSPI
+#if defined(CONFIG_FSL_DSPI)
 #define CONFIG_SPI_FLASH_STMICRO
 #endif
-#define FSL_QSPI_FLASH_SIZE            SZ_64M  /* 64MB */
-#define FSL_QSPI_FLASH_NUM             2
-#endif
 
 /*
  * RTC configuration
  */
 #define RTC
 #ifdef CONFIG_TARGET_LS2081ARDB
-#define CONFIG_RTC_PCF8563             1
 #define CONFIG_SYS_I2C_RTC_ADDR         0x51
 #else
 #define CONFIG_RTC_DS3231               1
@@ -294,13 +274,8 @@ unsigned long get_board_sys_clk(void);
 #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
 
@@ -308,11 +283,6 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_PCI_SCAN_SHOW
 #endif
 
-/*  MMC  */
-#ifdef CONFIG_MMC
-#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
-#endif
-
 #define BOOT_TARGET_DEVICES(func) \
        func(USB, usb, 0) \
        func(MMC, mmc, 0) \
@@ -321,48 +291,56 @@ unsigned long get_board_sys_clk(void);
 #include <config_distro_bootcmd.h>
 
 #ifdef CONFIG_TFABOOT
-#define QSPI_MC_INIT_CMD                       \
-       "env exists secureboot && "             \
-       "esbc_validate 0x20700000 && "          \
-       "esbc_validate 0x20740000;"             \
-       "fsl_mc start mc 0x20a00000 0x20e00000 \0"
+#define QSPI_MC_INIT_CMD                               \
+       "sf probe 0:0; "                                \
+       "sf read 0x80640000 0x640000 0x80000; "         \
+       "env exists secureboot && "                     \
+       "esbc_validate 0x80640000 && "                  \
+       "esbc_validate 0x80680000; "                    \
+       "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 0x80a00000 0x5000 0x1200;" \
+       "mmcinfo;mmc read 0x80a00000 0x5000 0x1000;" \
        "mmc read 0x80e00000 0x7000 0x800;"     \
        "env exists secureboot && "             \
-       "mmc read 0x80700000 0x3800 0x10 && "   \
-       "mmc read 0x80740000 0x3A00 0x10 && "   \
-       "esbc_validate 0x80700000 && "          \
-       "esbc_validate 0x80740000 ;"            \
+       "mmc read 0x80640000 0x3200 0x20 && "   \
+       "mmc read 0x80680000 0x3400 0x20 && "   \
+       "esbc_validate 0x80640000 && "          \
+       "esbc_validate 0x80680000 ;"            \
        "fsl_mc start mc 0x80a00000 0x80e00000\0"
 #define IFC_MC_INIT_CMD                                \
        "env exists secureboot && "     \
-       "esbc_validate 0x580700000 && "         \
-       "esbc_validate 0x580740000; "           \
+       "esbc_validate 0x580640000 && "         \
+       "esbc_validate 0x580680000; "           \
        "fsl_mc start mc 0x580a00000 0x580e00000 \0"
 #else
 #ifdef CONFIG_QSPI_BOOT
-#define MC_INIT_CMD                            \
-       "mcinitcmd=env exists secureboot && "   \
-       "esbc_validate 0x20700000 && "          \
-       "esbc_validate 0x20740000;"             \
-       "fsl_mc start mc 0x20a00000 0x20e00000 \0"
+#define MC_INIT_CMD                                    \
+       "mcinitcmd=sf probe 0:0; "                      \
+       "sf read 0x80640000 0x640000 0x80000; "         \
+       "env exists secureboot && "                     \
+       "esbc_validate 0x80640000 && "                  \
+       "esbc_validate 0x80680000; "                    \
+       "sf read 0x80a00000 0xa00000 0x200000; "        \
+       "sf read 0x80e00000 0xe00000 0x100000; "        \
+       "fsl_mc start mc 0x80a00000 0x80e00000 \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 0x80700000 0x3800 0x10 && "   \
-       "mmc read 0x80740000 0x3A00 0x10 && "   \
-       "esbc_validate 0x80700000 && "          \
-       "esbc_validate 0x80740000 ;"            \
-       "fsl_mc start mc 0x80000000 0x80100000\0" \
+       "mmc read 0x80640000 0x3200 0x20 && "   \
+       "mmc read 0x80680000 0x3400 0x20 && "   \
+       "esbc_validate 0x80640000 && "          \
+       "esbc_validate 0x80680000 ;"            \
+       "fsl_mc start mc 0x80a00000 0x80e00000\0" \
        "mcmemsize=0x70000000\0"
 #else
 #define MC_INIT_CMD                            \
        "mcinitcmd=env exists secureboot && "   \
-       "esbc_validate 0x580700000 && "         \
-       "esbc_validate 0x580740000; "           \
+       "esbc_validate 0x580640000 && "         \
+       "esbc_validate 0x580680000; "           \
        "fsl_mc start mc 0x580a00000 0x580e00000 \0"
 #endif
 #endif
@@ -384,7 +362,7 @@ unsigned long get_board_sys_clk(void);
        "scripthdraddr=0x80080000\0"            \
        "fdtheader_addr_r=0x80100000\0"         \
        "kernelheader_addr_r=0x80200000\0"      \
-       "kernelheader_addr=0x580800000\0"       \
+       "kernelheader_addr=0x580600000\0"       \
        "kernel_addr_r=0x81000000\0"            \
        "kernelheader_size=0x40000\0"           \
        "fdt_addr_r=0x90000000\0"               \
@@ -442,12 +420,12 @@ unsigned long get_board_sys_clk(void);
        "fdt_addr=0x64f00000\0"                 \
        "kernel_addr=0x581000000\0"             \
        "kernel_start=0x1000000\0"              \
-       "kernelheader_start=0x800000\0"         \
+       "kernelheader_start=0x600000\0"         \
        "scriptaddr=0x80000000\0"               \
        "scripthdraddr=0x80080000\0"            \
        "fdtheader_addr_r=0x80100000\0"         \
        "kernelheader_addr_r=0x80200000\0"      \
-       "kernelheader_addr=0x580800000\0"       \
+       "kernelheader_addr=0x580600000\0"       \
        "kernel_addr_r=0x81000000\0"            \
        "kernelheader_size=0x40000\0"           \
        "fdt_addr_r=0x90000000\0"               \
@@ -500,17 +478,20 @@ unsigned long get_board_sys_clk(void);
 
 #ifdef CONFIG_TFABOOT
 #define QSPI_NOR_BOOTCOMMAND                                           \
+                       "sf probe 0:0; "                                \
+                       "sf read 0x806c0000 0x6c0000 0x40000; "         \
                        "env exists mcinitcmd && env exists secureboot "\
-                       "&& esbc_validate 0x20780000; "                 \
+                       "&& esbc_validate 0x806c0000; "                 \
+                       "sf read 0x80d00000 0xd00000 0x100000; "        \
                        "env exists mcinitcmd && "                      \
-                       "fsl_mc lazyapply dpl 0x20d00000; "             \
+                       "fsl_mc lazyapply dpl 0x80d00000; "             \
                        "run distro_bootcmd;run qspi_bootcmd; "         \
                        "env exists secureboot && esbc_halt;"
 
 /* Try to boot an on-SD kernel first, then do normal distro boot */
 #define SD_BOOTCOMMAND                                         \
                        "env exists mcinitcmd && env exists secureboot "\
-                       "&& mmcinfo && mmc read $load_addr 0x3c00 0x800 " \
+                       "&& mmcinfo && mmc read $load_addr 0x3600 0x800 " \
                        "&& esbc_validate $load_addr; "                 \
                        "env exists mcinitcmd && run mcinitcmd "        \
                        "&& mmc read 0x80d00000 0x6800 0x800 "          \
@@ -521,52 +502,21 @@ unsigned long get_board_sys_clk(void);
 /* Try to boot an on-NOR kernel first, then do normal distro boot */
 #define IFC_NOR_BOOTCOMMAND                                            \
                        "env exists mcinitcmd && env exists secureboot "\
-                       "&& esbc_validate 0x580780000; env exists mcinitcmd "\
+                       "&& esbc_validate 0x5806C0000; env exists mcinitcmd "\
                        "&& fsl_mc lazyapply dpl 0x580d00000;"          \
                        "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                                             \
-                       "env exists mcinitcmd && env exists secureboot "\
-                       "&& esbc_validate 0x20780000; "                 \
-                       "env exists mcinitcmd && "                      \
-                       "fsl_mc lazyapply dpl 0x20d00000; "             \
-                       "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 0x3c00 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 0x580780000; 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
@@ -576,9 +526,7 @@ unsigned long get_board_sys_clk(void);
 #define AQ_PHY_ADDR3           0x02
 #define AQ_PHY_ADDR4           0x03
 #define AQR405_IRQ_MASK                0x36
-
 #define CONFIG_ETHPRIME                "DPMAC1@xgmii"
-#endif
 
 #include <asm/fsl_secure_boot.h>
 
Domain: System / Kernel;