diff options
| author | Tom Rini <trini@konsulko.com> | 2017-03-19 18:49:26 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-03-19 19:13:38 (GMT) |
| commit | 02ccab1908c405fe1449457d4a0d343784a30acb (patch) | |
| tree | 3a5d41abff96a3af22587ace67713d5c0165b097 /include/configs/apalis_imx6.h | |
| parent | f40574e2d78c96a3818c4fa2379382d924866a6e (diff) | |
| parent | d883fcc6bbb2fcc3df90857fee99c2f543a0289c (diff) | |
| download | u-boot-02ccab1908c405fe1449457d4a0d343784a30acb.tar.xz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/bk4r1_defconfig
configs/colibri_vf_defconfig
configs/pcm052_defconfig
include/configs/colibri_vf.h
include/configs/pcm052.h
Diffstat (limited to 'include/configs/apalis_imx6.h')
| -rw-r--r-- | include/configs/apalis_imx6.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index d6d976b..c0c575a 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -195,6 +195,7 @@ "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" #define MEM_LAYOUT_ENV_SETTINGS \ + "bootm_size=0x20000000\0" \ "fdt_addr_r=0x12000000\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ |