Merge tag 'xilinx-for-v2020.07-rc2' of https://gitlab.denx.de/u-boot/custodians/u...

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

diff --git a/include/configs/lx2160ardb.h b/include/configs/lx2160ardb.h
index de385f8..f54edf3 100644 (file)
--- a/include/configs/lx2160ardb.h
+++ b/include/configs/lx2160ardb.h
@@ -22,7 +22,9 @@
 #define QIXIS_RCFG_CTL_WATCHDOG_ENBLE  0x08
 #define QIXIS_LBMAP_MASK               0x0f
 #define QIXIS_LBMAP_SD
+#define QIXIS_LBMAP_EMMC
 #define QIXIS_RCW_SRC_SD           0x08
+#define QIXIS_RCW_SRC_EMMC         0x09
 #define NON_EXTENDED_DUTCFG
 
 /* VID */
@@ -91,7 +93,6 @@
        EXTRA_ENV_SETTINGS                      \
        "boot_scripts=lx2160ardb_boot.scr\0"    \
        "boot_script_hdr=hdr_lx2160ardb_bs.out\0"       \
-       "lx2160ardb_vdd_mv=800\0"               \
        "BOARD=lx2160ardb\0"                    \
        "xspi_bootcmd=echo Trying load from flexspi..;"         \
                "sf probe 0:0 && sf read $load_addr "           \
@@ -105,6 +106,13 @@
                "env exists secureboot && mmc read $kernelheader_addr_r "\
                "$kernelhdr_addr_sd $kernelhdr_size_sd "        \
                " && esbc_validate ${kernelheader_addr_r};"     \
+               "bootm $load_addr#$BOARD\0"                     \
+       "sd2_bootcmd=echo Trying load from emmc card..;"        \
+               "mmc dev 1; 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"
 
 #include <asm/fsl_secure_boot.h>