|
@@ -98,12 +98,8 @@ void lmb_init(struct lmb *lmb)
|
|
|
lmb->reserved.size = 0;
|
|
|
}
|
|
|
|
|
|
-/* Initialize the struct, add memory and call arch/board reserve functions */
|
|
|
-void lmb_init_and_reserve(struct lmb *lmb, phys_addr_t base, phys_size_t size,
|
|
|
- void *fdt_blob)
|
|
|
+static void lmb_reserve_common(struct lmb *lmb, void *fdt_blob)
|
|
|
{
|
|
|
- lmb_init(lmb);
|
|
|
- lmb_add(lmb, base, size);
|
|
|
arch_lmb_reserve(lmb);
|
|
|
board_lmb_reserve(lmb);
|
|
|
|
|
@@ -111,6 +107,37 @@ void lmb_init_and_reserve(struct lmb *lmb, phys_addr_t base, phys_size_t size,
|
|
|
boot_fdt_add_mem_rsv_regions(lmb, fdt_blob);
|
|
|
}
|
|
|
|
|
|
+/* Initialize the struct, add memory and call arch/board reserve functions */
|
|
|
+void lmb_init_and_reserve(struct lmb *lmb, bd_t *bd, void *fdt_blob)
|
|
|
+{
|
|
|
+#ifdef CONFIG_NR_DRAM_BANKS
|
|
|
+ int i;
|
|
|
+#endif
|
|
|
+
|
|
|
+ lmb_init(lmb);
|
|
|
+#ifdef CONFIG_NR_DRAM_BANKS
|
|
|
+ for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
|
|
|
+ if (bd->bi_dram[i].size) {
|
|
|
+ lmb_add(lmb, bd->bi_dram[i].start,
|
|
|
+ bd->bi_dram[i].size);
|
|
|
+ }
|
|
|
+ }
|
|
|
+#else
|
|
|
+ if (bd->bi_memsize)
|
|
|
+ lmb_add(lmb, bd->bi_memstart, bd->bi_memsize);
|
|
|
+#endif
|
|
|
+ lmb_reserve_common(lmb, fdt_blob);
|
|
|
+}
|
|
|
+
|
|
|
+/* Initialize the struct, add memory and call arch/board reserve functions */
|
|
|
+void lmb_init_and_reserve_range(struct lmb *lmb, phys_addr_t base,
|
|
|
+ phys_size_t size, void *fdt_blob)
|
|
|
+{
|
|
|
+ lmb_init(lmb);
|
|
|
+ lmb_add(lmb, base, size);
|
|
|
+ lmb_reserve_common(lmb, fdt_blob);
|
|
|
+}
|
|
|
+
|
|
|
/* This routine called with relocation disabled. */
|
|
|
static long lmb_add_region(struct lmb_region *rgn, phys_addr_t base, phys_size_t size)
|
|
|
{
|