layerscape: use the lmb API's to add RAM memory

The EFI memory allocations are now being done through the LMB module,
and hence the memory map is maintained by the LMB module. Use the
lmb_arch_add_memory() API function to add the usable RAM memory to the
LMB's memory map.

Signed-off-by: Sughosh Ganu <sughosh.ganu@linaro.org>

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index f9c2083677a625775aeb1fe72f987bd7f7867a17..d2d3e346a36fe975e34765f0f18d7b72417761d3 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -10,6 +10,7 @@
 #include <env.h>
 #include <init.h>
 #include <hang.h>
+#include <lmb.h>
 #include <log.h>
 #include <net.h>
 #include <vsprintf.h>
@@ -1525,8 +1526,8 @@ int dram_init_banksize(void)
        return 0;
 }
 
-#if CONFIG_IS_ENABLED(EFI_LOADER)
-void efi_add_known_memory(void)
+#if CONFIG_IS_ENABLED(LMB_ARCH_MEM_MAP)
+void lmb_arch_add_memory(void)
 {
        int i;
        phys_addr_t ram_start;
@@ -1548,8 +1549,7 @@ void efi_add_known_memory(void)
                    gd->arch.resv_ram < ram_start + ram_size)
                        ram_size = gd->arch.resv_ram - ram_start;
 #endif
-               efi_add_memory_map(ram_start, ram_size,
-                                  EFI_CONVENTIONAL_MEMORY);
+               lmb_add(ram_start, ram_size);
        }
 }
 #endif

diff --git a/lib/Kconfig b/lib/Kconfig
index 3d2011ad4b745163181f7f7dfc87b10b3aba1f9e..b6b8b8d9c29af9472628c59d13bdffd7db3382d5 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -1122,6 +1122,7 @@ config SPL_LMB
 config LMB_ARCH_MEM_MAP
        bool "Add an architecture specific memory map"
        depends on LMB
+       default y if FSL_LAYERSCAPE
        help
          Some architectures have special or unique aspects which need
          consideration when adding memory ranges to the list of available