Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

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

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 8e2784b..45ce460 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -297,9 +297,9 @@
 
 #ifdef CONFIG_LPUART
 #define CONFIG_EXTRA_ENV_SETTINGS       \
-       "bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \
+       "bootargs=root=/dev/ram0 rw console=ttyLP0,115200 "     \
+               "cma=64M@0x0-0xb0000000\0" \
        "initrd_high=0xffffffff\0"      \
-       "fdt_high=0xffffffff\0"         \
        "fdt_addr=0x64f00000\0"         \
        "kernel_addr=0x65000000\0"      \
        "scriptaddr=0x80000000\0"       \
@@ -313,7 +313,6 @@
        "kernel_size=0x2800000\0"       \
        "kernel_addr_sd=0x8000\0"       \
        "kernel_size_sd=0x14000\0"      \
-       "$othbootargs\0"                \
        "othbootargs=cma=64M@0x0-0xb0000000\0"  \
        BOOTENV                         \
        "boot_scripts=ls1021atwr_boot.scr\0"    \
@@ -355,9 +354,9 @@
                "$kernel_size && bootm $load_addr#$board\0"
 #else
 #define CONFIG_EXTRA_ENV_SETTINGS      \
-       "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \
+       "bootargs=root=/dev/ram0 rw console=ttyS0,115200 "      \
+               "cma=64M@0x0-0xb0000000\0" \
        "initrd_high=0xffffffff\0"      \
-       "fdt_high=0xffffffff\0"         \
        "fdt_addr=0x64f00000\0"         \
        "kernel_addr=0x61000000\0"      \
        "kernelheader_addr=0x60800000\0"        \
@@ -375,7 +374,6 @@
        "kernel_size_sd=0x14000\0"      \
        "kernelhdr_addr_sd=0x4000\0"            \
        "kernelhdr_size_sd=0x10\0"              \
-       "$othbootargs\0"                        \
        "othbootargs=cma=64M@0x0-0xb0000000\0"  \
        BOOTENV                         \
        "boot_scripts=ls1021atwr_boot.scr\0"    \
@@ -441,6 +439,7 @@
 /*
  * Miscellaneous configurable options
  */
+#define CONFIG_SYS_BOOTMAPSZ           (256 << 20)
 
 #define CONFIG_SYS_MEMTEST_START       0x80000000
 #define CONFIG_SYS_MEMTEST_END         0x9fffffff