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

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

diff --git a/include/configs/lx2160aqds.h b/include/configs/lx2160aqds.h
index f25cab1..3dd071f 100644 (file)
--- a/include/configs/lx2160aqds.h
+++ b/include/configs/lx2160aqds.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
 #define QIXIS_SDID_MASK                        0x07
 #define QIXIS_ESDHC_NO_ADAPTER         0x7
@@ -119,7 +121,6 @@ u8 qixis_esdhc_detect_quirk(void);
 /* Initial environment variables */
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        EXTRA_ENV_SETTINGS                      \
-       "lx2160aqds_vdd_mv=800\0"               \
        "boot_scripts=lx2160aqds_boot.scr\0"    \
        "boot_script_hdr=hdr_lx2160aqds_bs.out\0"       \
        "BOARD=lx2160aqds\0"                    \
@@ -135,6 +136,13 @@ u8 qixis_esdhc_detect_quirk(void);
                "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>