projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unnecessary instances of DECLARE_GLOBAL_DATA_PTR
[oweals/u-boot.git]
/
lib
/
lmb.c
diff --git
a/lib/lmb.c
b/lib/lmb.c
index 081e4181b45c10c4980062eb5506ae4bfa0e4948..031f0e1ac895289f772fb4bf538626ff065d1106 100644
(file)
--- a/
lib/lmb.c
+++ b/
lib/lmb.c
@@
-236,7
+236,7
@@
long lmb_reserve(struct lmb *lmb, phys_addr_t base, phys_size_t size)
return lmb_add_region(_rgn, base, size);
}
return lmb_add_region(_rgn, base, size);
}
-long lmb_overlaps_region(struct lmb_region *rgn, phys_addr_t base,
+
static
long lmb_overlaps_region(struct lmb_region *rgn, phys_addr_t base,
phys_size_t size)
{
unsigned long i;
phys_size_t size)
{
unsigned long i;
@@
-295,7
+295,10
@@
phys_addr_t __lmb_alloc_base(struct lmb *lmb, phys_size_t size, ulong align, phy
if (max_addr == LMB_ALLOC_ANYWHERE)
base = lmb_align_down(lmbbase + lmbsize - size, align);
else if (lmbbase < max_addr) {
if (max_addr == LMB_ALLOC_ANYWHERE)
base = lmb_align_down(lmbbase + lmbsize - size, align);
else if (lmbbase < max_addr) {
- base = min(lmbbase + lmbsize, max_addr);
+ base = lmbbase + lmbsize;
+ if (base < lmbbase)
+ base = -1;
+ base = min(base, max_addr);
base = lmb_align_down(base - size, align);
} else
continue;
base = lmb_align_down(base - size, align);
} else
continue;
@@
-332,14
+335,12
@@
int lmb_is_reserved(struct lmb *lmb, phys_addr_t addr)
return 0;
}
return 0;
}
-
void __
board_lmb_reserve(struct lmb *lmb)
+
__weak void
board_lmb_reserve(struct lmb *lmb)
{
/* please define platform specific board_lmb_reserve() */
}
{
/* please define platform specific board_lmb_reserve() */
}
-void board_lmb_reserve(struct lmb *lmb) __attribute__((weak, alias("__board_lmb_reserve")));
-
void __
arch_lmb_reserve(struct lmb *lmb)
+
__weak void
arch_lmb_reserve(struct lmb *lmb)
{
/* please define platform specific arch_lmb_reserve() */
}
{
/* please define platform specific arch_lmb_reserve() */
}
-void arch_lmb_reserve(struct lmb *lmb) __attribute__((weak, alias("__arch_lmb_reserve")));