]> git.baikalelectronics.ru Git - uboot.git/commitdiff
toradex: colibri_imx6: overwrite CMA memory set in device tree
authorBhuvanchandra DV <bhuvanchandra.dv@toradex.com>
Fri, 8 Feb 2019 17:42:24 +0000 (18:42 +0100)
committerStefano Babic <sbabic@denx.de>
Sat, 13 Apr 2019 18:30:09 +0000 (20:30 +0200)
Make sure CMA memory is not greater than 50% of available physical
memory.

Allow user to change the CMA memory via 'cma-size' U-Boot environment
variable.

Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
board/toradex/colibri_imx6/colibri_imx6.c

index efb6b925afacac7bacc1b7194f2d93c93e5a6acc..35adff1d0094ff47a51510fe2807860c766dcff5 100644 (file)
@@ -22,6 +22,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/sata.h>
 #include <asm/mach-imx/video.h>
+#include <cpu.h>
 #include <dm/platform_data/serial_mxc.h>
 #include <environment.h>
 #include <fsl_esdhc.h>
@@ -688,7 +689,18 @@ int checkboard(void)
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 int ft_board_setup(void *blob, bd_t *bd)
 {
-       return ft_common_board_setup(blob, bd);
+       u32 cma_size;
+
+       ft_common_board_setup(blob, bd);
+
+       cma_size = getenv_ulong("cma-size", 10, 320 * 1024 * 1024);
+       cma_size = min((u32)(gd->ram_size >> 1), cma_size);
+
+       fdt_setprop_u32(blob,
+                       fdt_path_offset(blob, "/reserved-memory/linux,cma"),
+                       "size",
+                       cma_size);
+       return 0;
 }
 #endif