Merge branch '2020-05-07-more-kconfig-migrations'

[oweals/u-boot.git] / include / configs / ls1028a_common.h

diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h
index d3d787f14d73cbc92b0d686a129063a5e05c62cb..f9040e661d018e7723fd85cec3a75decafe000b9 100644 (file)
--- a/include/configs/ls1028a_common.h
+++ b/include/configs/ls1028a_common.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2019 NXP
+ * Copyright 2019-2020 NXP
  */
 
 #ifndef __L1028A_COMMON_H
@@ -26,10 +26,6 @@
 #define CONFIG_SYS_DDR_BLOCK2_BASE     0x2080000000ULL
 #define CONFIG_SYS_FSL_DDR_MAIN_NUM_CTRLS      1
 
-#define CONFIG_CMD_MEMTEST
-#define CONFIG_SYS_MEMTEST_START        0x80000000
-#define CONFIG_SYS_MEMTEST_END          0x9fffffff
-
 /*
  * SMP Definitinos
  */
@@ -42,7 +38,9 @@
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 2048 * 1024)
 
 /* I2C */
+#ifndef CONFIG_DM_I2C
 #define CONFIG_SYS_I2C
+#endif
 
 /* Serial Port */
 #define CONFIG_CONS_INDEX       1
@@ -67,85 +65,21 @@
 
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \
-       func(USB, usb, 0)
+       func(MMC, mmc, 1) \
+       func(USB, usb, 0) \
+       func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
 
-/* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS              \
-       "board=ls1028ardb\0"                    \
-       "hwconfig=fsl_ddr:bank_intlv=auto\0"    \
-       "ramdisk_addr=0x800000\0"               \
-       "ramdisk_size=0x2000000\0"              \
-       "fdt_high=0xffffffffffffffff\0"         \
-       "initrd_high=0xffffffffffffffff\0"      \
-       "fdt_addr=0x00f00000\0"                 \
-       "kernel_addr=0x01000000\0"              \
-       "scriptaddr=0x80000000\0"               \
-       "scripthdraddr=0x80080000\0"            \
-       "fdtheader_addr_r=0x80100000\0"         \
-       "kernelheader_addr_r=0x80200000\0"      \
-       "load_addr=0xa0000000\0"            \
-       "kernel_addr_r=0x81000000\0"            \
-       "fdt_addr_r=0x90000000\0"               \
-       "ramdisk_addr_r=0xa0000000\0"           \
-       "kernel_start=0x1000000\0"              \
-       "kernelheader_start=0x800000\0"         \
-       "kernel_load=0xa0000000\0"              \
-       "kernel_size=0x2800000\0"               \
-       "kernelheader_size=0x40000\0"           \
-       "kernel_addr_sd=0x8000\0"               \
-       "kernel_size_sd=0x14000\0"              \
-       "kernelhdr_addr_sd=0x4000\0"            \
-       "kernelhdr_size_sd=0x10\0"              \
-       "console=ttyS0,115200\0"                \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"        \
-       BOOTENV                                 \
-       "boot_scripts=ls1028ardb_boot.scr\0"    \
-       "boot_script_hdr=hdr_ls1028ardb_bs.out\0"       \
-       "scan_dev_for_boot_part="               \
-               "part list ${devtype} ${devnum} devplist; "   \
-               "env exists devplist || setenv devplist 1; "  \
-               "for distro_bootpart in ${devplist}; do "     \
-                 "if fstype ${devtype} "                  \
-                       "${devnum}:${distro_bootpart} "      \
-                       "bootfstype; then "                  \
-                       "run scan_dev_for_boot; "            \
-                 "fi; "                                   \
-               "done\0"                                   \
-       "scan_dev_for_boot="                              \
-               "echo Scanning ${devtype} "               \
-                               "${devnum}:${distro_bootpart}...; "  \
-               "for prefix in ${boot_prefixes}; do "     \
-                       "run scan_dev_for_scripts; "      \
-               "done;"                                   \
-               "\0"                                      \
-       "boot_a_script="                                  \
-               "load ${devtype} ${devnum}:${distro_bootpart} "  \
-                       "${scriptaddr} ${prefix}${script}; "    \
-               "env exists secureboot && load ${devtype} "     \
-                       "${devnum}:${distro_bootpart} "         \
-                       "${scripthdraddr} ${prefix}${boot_script_hdr} " \
-                       "&& esbc_validate ${scripthdraddr};"    \
-               "source ${scriptaddr}\0"          \
-       "sd_bootcmd=echo Trying load from SD ..;"       \
-               "mmcinfo; mmc read $load_addr "         \
-               "$kernel_addr_sd $kernel_size_sd && "   \
-               "env exists secureboot && mmc read $kernelheader_addr_r " \
-               "$kernelhdr_addr_sd $kernelhdr_size_sd "                \
-               " && esbc_validate ${kernelheader_addr_r};"     \
-               "bootm $load_addr#$board\0"             \
-       "emmc_bootcmd=echo Trying load from EMMC ..;"   \
-               "mmcinfo; mmc dev 1; mmc read $load_addr "              \
-               "$kernel_addr_sd $kernel_size_sd && "   \
-               "env exists secureboot && mmc read $kernelheader_addr_r " \
-               "$kernelhdr_addr_sd $kernelhdr_size_sd "                \
-               " && esbc_validate ${kernelheader_addr_r};"     \
-               "bootm $load_addr#$board\0"
-
 #undef CONFIG_BOOTCOMMAND
 
+#define XSPI_NOR_BOOTCOMMAND   \
+       "run xspi_hdploadcmd; run distro_bootcmd; run xspi_bootcmd; " \
+       "env exists secureboot && esbc_halt;;"
 #define SD_BOOTCOMMAND \
-       "run distro_bootcmd;run sd_bootcmd; " \
+       "run sd_hdploadcmd; run distro_bootcmd;run sd_bootcmd; " \
+       "env exists secureboot && esbc_halt;"
+#define SD2_BOOTCOMMAND        \
+       "run emmc_hdploadcmd; run distro_bootcmd;run emmc_bootcmd; " \
        "env exists secureboot && esbc_halt;"
 
 /* Monitor Command Prompt */
@@ -164,26 +98,15 @@
 
 /*  MMC  */
 #ifdef CONFIG_MMC
-#define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #endif
 
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #define OCRAM_NONSECURE_SIZE           0x00010000
-#define CONFIG_ENV_OFFSET              0x500000        /* 5MB */
 #define CONFIG_SYS_FSL_QSPI_BASE       0x20000000
-#define CONFIG_ENV_ADDR        CONFIG_SYS_FSL_QSPI_BASE + CONFIG_ENV_OFFSET
-#define CONFIG_ENV_SIZE                        0x2000          /* 8KB */
-#define CONFIG_ENV_SECT_SIZE           0x40000
 
 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
 
-/*  MMC  */
-#ifdef CONFIG_MMC
-#define CONFIG_FSL_ESDHC
-#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
-#endif
-
 /* I2C bus multiplexer */
 #define I2C_MUX_PCA_ADDR_PRI            0x77 /* Primary Mux*/
 #define I2C_MUX_CH_DEFAULT              0x8
@@ -197,8 +120,15 @@
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS      3
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  5
 
-#ifdef CONFIG_SECURE_BOOT
+/* DisplayPort */
+#define DP_PWD_EN_DEFAULT_MASK          0x8
+
+#ifdef CONFIG_NXP_ESBC
 #include <asm/fsl_secure_boot.h>
 #endif
 
+/* Ethernet */
+/* smallest ENETC BD ring has 8 entries */
+#define CONFIG_SYS_RX_ETH_BUFFER               8
+
 #endif /* __L1028A_COMMON_H */