Merge https://gitlab.denx.de/u-boot/custodians/u-boot-stm

[platform/kernel/u-boot.git] / include / configs / lx2160a_common.h

diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index cfb20d3..d3b5c58 100644 (file)
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2018-2019 NXP
+ * Copyright 2018-2020 NXP
  */
 
 #ifndef __LX2_COMMON_H
@@ -20,7 +20,6 @@
 #define CONFIG_SYS_FLASH_BASE          0x20000000
 
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F      1
 
 /* DDR */
 #define CONFIG_FSL_DDR_INTERACTIVE     /* Interactive debugging */
@@ -53,7 +52,7 @@
 #define CONFIG_SYS_LOAD_ADDR   (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000)
 
 /* SMP Definitinos  */
-#define CPU_RELEASE_ADDR               secondary_boot_func
+#define CPU_RELEASE_ADDR               secondary_boot_addr
 
 /* Generic Timer Definitions */
 /*
@@ -78,7 +77,6 @@
                                        (void *)CONFIG_SYS_SERIAL1, \
                                        (void *)CONFIG_SYS_SERIAL2, \
                                        (void *)CONFIG_SYS_SERIAL3 }
-#define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 
 /* MC firmware */
@@ -174,9 +172,6 @@ unsigned long get_board_ddr_clk(void);
 
 #define CONFIG_SYS_MMC_ENV_DEV          0
 
-/* Allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
@@ -187,20 +182,34 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /* Increase max gunzip size */
 
 /* Initial environment variables */
-#define XSPI_MC_INIT_CMD                       \
-       "env exists secureboot && "             \
-       "esbc_validate 0x20700000 && "          \
-       "esbc_validate 0x20740000 ;"            \
-       "fsl_mc start mc 0x20a00000 0x20e00000\0"
+#define XSPI_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 0x300000 && "      \
+       "sf read 0x80e00000 0xe00000 0x100000; "        \
+       "fsl_mc start mc 0x80a00000 0x80e00000\0"
 
 #define SD_MC_INIT_CMD                         \
        "mmc read 0x80a00000 0x5000 0x1200;"    \
        "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 SD2_MC_INIT_CMD                                \
+       "mmc dev 1; mmc read 0x80a00000 0x5000 0x1200;" \
+       "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 0x80a00000 0x80e00000\0"
 
 #define EXTRA_ENV_SETTINGS                     \
@@ -211,7 +220,7 @@ unsigned long get_board_ddr_clk(void);
        "initrd_high=0xffffffffffffffff\0"      \
        "fdt_addr=0x64f00000\0"                 \
        "kernel_start=0x1000000\0"              \
-       "kernelheader_start=0x7C0000\0"         \
+       "kernelheader_start=0x600000\0"         \
        "scriptaddr=0x80000000\0"               \
        "scripthdraddr=0x80080000\0"            \
        "fdtheader_addr_r=0x80100000\0"         \
@@ -222,15 +231,13 @@ unsigned long get_board_ddr_clk(void);
        "load_addr=0xa0000000\0"                \
        "kernel_size=0x2800000\0"               \
        "kernel_addr_sd=0x8000\0"               \
-       "kernelhdr_addr_sd=0x3E00\0"            \
+       "kernelhdr_addr_sd=0x3000\0"            \
        "kernel_size_sd=0x1d000\0"              \
-       "kernelhdr_size_sd=0x10\0"              \
+       "kernelhdr_size_sd=0x20\0"              \
        "console=ttyAMA0,38400n8\0"             \
        BOOTENV                                 \
        "mcmemsize=0x70000000\0"                \
        XSPI_MC_INIT_CMD                                \
-       "boot_scripts=lx2160ardb_boot.scr\0"    \
-       "boot_script_hdr=hdr_lx2160ardb_bs.out\0"       \
        "scan_dev_for_boot_part="               \
                "part list ${devtype} ${devnum} devplist; "     \
                "env exists devplist || setenv devplist 1; "    \
@@ -251,10 +258,13 @@ unsigned long get_board_ddr_clk(void);
                "source ${scriptaddr}\0"
 
 #define XSPI_NOR_BOOTCOMMAND                                           \
-                       "env exists mcinitcmd && env exists secureboot "\
-                       "&& esbc_validate 0x20780000; "                 \
+                       "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 0x20d00000; "             \
+                       "fsl_mc lazyapply dpl 0x80d00000; "             \
                        "run distro_bootcmd;run xspi_bootcmd; "         \
                        "env exists secureboot && esbc_halt;"
 
@@ -262,16 +272,28 @@ unsigned long get_board_ddr_clk(void);
                "env exists mcinitcmd && mmcinfo; "             \
                "mmc read 0x80d00000 0x6800 0x800; "            \
                "env exists mcinitcmd && env exists secureboot "        \
-               " && mmc read 0x80780000 0x3C00 0x10 "          \
-               "&& esbc_validate 0x80780000;env exists mcinitcmd "     \
+               " && mmc read 0x806C0000 0x3600 0x20 "          \
+               "&& esbc_validate 0x806C0000;env exists mcinitcmd "     \
                "&& fsl_mc lazyapply dpl 0x80d00000;"           \
                "run distro_bootcmd;run sd_bootcmd;"            \
                "env exists secureboot && esbc_halt;"
 
+#define SD2_BOOTCOMMAND                                                \
+               "mmc dev 1; env exists mcinitcmd && mmcinfo; "  \
+               "mmc read 0x80d00000 0x6800 0x800; "            \
+               "env exists mcinitcmd && env exists secureboot "        \
+               " && mmc read 0x806C0000 0x3600 0x20 "          \
+               "&& esbc_validate 0x806C0000;env exists mcinitcmd "     \
+               "&& fsl_mc lazyapply dpl 0x80d00000;"           \
+               "run distro_bootcmd;run sd2_bootcmd;"           \
+               "env exists secureboot && esbc_halt;"
+
 #define BOOT_TARGET_DEVICES(func) \
        func(USB, usb, 0) \
        func(MMC, mmc, 0) \
-       func(SCSI, scsi, 0)
+       func(MMC, mmc, 1) \
+       func(SCSI, scsi, 0) \
+       func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
 
 #endif /* __LX2_COMMON_H */