summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorYe.Li <B37916@freescale.com>2015-09-30 16:23:58 +0800
committerMax Krummenacher <max.krummenacher@toradex.com>2016-03-09 14:42:50 +0100
commit6f723fef6bdd35b4835ffd8cc36c8ce1b6747257 (patch)
tree9740eea52ee074e7c98f3f2e2e0f0c973fe73b7e /include
parent59c4d9eb81652b6a71c04816ac1140b9d2efaa05 (diff)
MLK-11662-1 imx: mx6ul: Change 14x14 LPDDR2 ARM2 memory size to 256MB
The actual memory size is 256MB not 512MB, otherwise it has a wrap problem in memory and will cause memtester failed. Signed-off-by: Ye.Li <B37916@freescale.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/mx6ul_14x14_ddr3_arm2.h2
-rw-r--r--include/configs/mx6ul_14x14_lpddr2_arm2.h4
-rw-r--r--include/configs/mx6ul_arm2.h4
3 files changed, 9 insertions, 1 deletions
diff --git a/include/configs/mx6ul_14x14_ddr3_arm2.h b/include/configs/mx6ul_14x14_ddr3_arm2.h
index 30e074f909..8b0b4babdd 100644
--- a/include/configs/mx6ul_14x14_ddr3_arm2.h
+++ b/include/configs/mx6ul_14x14_ddr3_arm2.h
@@ -29,6 +29,8 @@
#define CONFIG_VIDEO
#define CONFIG_FSL_USDHC
+#define CONFIG_BOOTARGS_CMA_SIZE ""
+
#include "mx6ul_arm2.h"
#define PHYS_SDRAM_SIZE SZ_1G
diff --git a/include/configs/mx6ul_14x14_lpddr2_arm2.h b/include/configs/mx6ul_14x14_lpddr2_arm2.h
index 5b296881d3..30bad9cfc1 100644
--- a/include/configs/mx6ul_14x14_lpddr2_arm2.h
+++ b/include/configs/mx6ul_14x14_lpddr2_arm2.h
@@ -40,9 +40,11 @@
#undef CONFIG_VIDEO
#endif
+#define CONFIG_BOOTARGS_CMA_SIZE "cma=96M "
+
#include "mx6ul_arm2.h"
-#define PHYS_SDRAM_SIZE SZ_512M
+#define PHYS_SDRAM_SIZE SZ_256M
#ifdef CONFIG_SYS_USE_SPINOR
#define CONFIG_CMD_SF
diff --git a/include/configs/mx6ul_arm2.h b/include/configs/mx6ul_arm2.h
index 076cabfb0d..4b4d53aecc 100644
--- a/include/configs/mx6ul_arm2.h
+++ b/include/configs/mx6ul_arm2.h
@@ -108,6 +108,7 @@
#define CONFIG_MFG_ENV_SETTINGS \
"mfgtool_args=setenv bootargs console=${console},${baudrate} " \
+ CONFIG_BOOTARGS_CMA_SIZE \
"rdinit=/linuxrc " \
"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
"g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
@@ -128,6 +129,7 @@
"console=ttymxc0\0" \
"bootargs=console=ttymxc0,115200 ubi.mtd=3 " \
"root=ubi0:rootfs rootfstype=ubifs " \
+ CONFIG_BOOTARGS_CMA_SIZE \
"mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\
"bootcmd=nand read ${loadaddr} 0x4000000 0x800000;"\
"nand read ${fdt_addr} 0x5000000 0x100000;"\
@@ -151,6 +153,7 @@
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
+ CONFIG_BOOTARGS_CMA_SIZE \
"root=${mmcroot}\0" \
"loadbootscript=" \
"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
@@ -174,6 +177,7 @@
"bootz; " \
"fi;\0" \
"netargs=setenv bootargs console=${console},${baudrate} " \
+ CONFIG_BOOTARGS_CMA_SIZE \
"root=/dev/nfs " \
"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
"netboot=echo Booting from net ...; " \