Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[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 0e0e72d..637619c 100644 (file)
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -100,7 +100,7 @@
  * 512MB aligned, so the min size to hide is 512MB.
  */
 #ifdef CONFIG_FSL_MC_ENET
-#define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE   (512UL * 1024 * 1024)
+#define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE   (256UL * 1024 * 1024)
 #endif
 
 /* I2C bus multiplexer */
@@ -194,11 +194,19 @@ unsigned long get_board_ddr_clk(void);
 
 /* 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 SD_MC_INIT_CMD                         \
        "mmc read 0x80000000 0x5000 0x800;"     \
        "mmc read 0x80100000 0x7000 0x800;"     \
+       "env exists secureboot && "             \
+       "mmc read 0x80700000 0x3800 0x10 && "   \
+       "mmc read 0x80740000 0x3A00 0x10 && "   \
+       "esbc_validate 0x80700000 && "          \
+       "esbc_validate 0x80740000 ;"            \
        "fsl_mc start mc 0x80000000 0x80100000\0"
 
 #define EXTRA_ENV_SETTINGS                     \
@@ -209,7 +217,7 @@ unsigned long get_board_ddr_clk(void);
        "initrd_high=0xffffffffffffffff\0"      \
        "fdt_addr=0x64f00000\0"                 \
        "kernel_start=0x1000000\0"              \
-       "kernelheader_start=0x800000\0"         \
+       "kernelheader_start=0x7C0000\0"         \
        "scriptaddr=0x80000000\0"               \
        "scripthdraddr=0x80080000\0"            \
        "fdtheader_addr_r=0x80100000\0"         \
@@ -220,7 +228,9 @@ 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"            \
        "kernel_size_sd=0x1d000\0"              \
+       "kernelhdr_size_sd=0x10\0"              \
        "console=ttyAMA0,38400n8\0"             \
        BOOTENV                                 \
        "mcmemsize=0x70000000\0"                \