]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
fsl-ddr: Allow system to boot if we have more than 4G of memory
authorKumar Gala <galak@kernel.crashing.org>
Wed, 11 Feb 2009 05:53:40 +0000 (23:53 -0600)
committerAndy Fleming <afleming@freescale.com>
Tue, 17 Feb 2009 00:05:55 +0000 (18:05 -0600)
Previously if we >=4G of memory and !CONFIG_PHYS_64BIT we'd report
an error and hang.  Instead of doing that since DDR is mapped in the
lowest priority LAWs we setup the DDR controller and the max amount
of memory we report back is what we can map (CONFIG_MAX_MEM_MAPPED)

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Becky Bruce <beckyb@kernel.crashing.org>
cpu/mpc8xxx/ddr/main.c

index f1ad1328658726c5256b5946ca8d5565d273e0b7..305f7fbd4cafface96491d2cd17c2999520b38b3 100644 (file)
@@ -429,7 +429,7 @@ fsl_ddr_compute(fsl_ddr_info_t *pinfo, unsigned int start_step)
                if (max_end >= 0xff) {
                        printf("This U-Boot only supports < 4G of DDR\n");
                        printf("You could rebuild it with CONFIG_PHYS_64BIT\n");
                if (max_end >= 0xff) {
                        printf("This U-Boot only supports < 4G of DDR\n");
                        printf("You could rebuild it with CONFIG_PHYS_64BIT\n");
-                       return 0;       /* Ensure DDR setup failure. */
+                       return CONFIG_MAX_MEM_MAPPED;
                }
 #endif
 
                }
 #endif