Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-samsung

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

diff --git a/include/configs/lx2160aqds.h b/include/configs/lx2160aqds.h
index 1eb63d8..1cc015c 100644 (file)
--- a/include/configs/lx2160aqds.h
+++ b/include/configs/lx2160aqds.h
@@ -121,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"                    \
@@ -132,7 +131,14 @@ u8 qixis_esdhc_detect_quirk(void);
                "$kernelheader_size && esbc_validate ${kernelheader_addr_r}; "\
                " bootm $load_addr#$BOARD\0"                    \
        "sd_bootcmd=echo Trying load from sd card..;"           \
-               "mmcinfo; mmc read $load_addr "                 \
+               "mmc dev 0; 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"                     \
+       "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 "        \