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

2014-09-26 09:57:52 -04:00
parent 2c3dc792b6 c7eae7fcb1
commit 2c2277f15c
39 changed files with 1023 additions and 256 deletions
--- a/6
+++ b/6
@@ -538,6 +538,12 @@ The following options need to be configured:
 		interleaving mode, handled by Dickens for Freescale layerscape
 		SoCs with ARM core.

+		CONFIG_SYS_FSL_DDR_MAIN_NUM_CTRLS
+		Number of controllers used as main memory.
+
+		CONFIG_SYS_FSL_OTHER_DDR_NUM_CTRLS
+		Number of controllers used for other than main memory.
+
 - Intel Monahans options:
 		CONFIG_SYS_MONAHANS_RUN_MODE_OSC_RATIO