From: Tom Rini <trini@konsulko.com>
Date: Tue, 25 Mar 2025 02:10:55 +0000 (-0600)
Subject: Merge tag 'v2025.04-rc5' into next
X-Git-Tag: v2025.07-rc1~18^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=647cb87b5ab2ad6469cf42f3272f00688bd26039;p=pandora-u-boot.git

Merge tag 'v2025.04-rc5' into next

Prepare v2025.04-rc5
---

647cb87b5ab2ad6469cf42f3272f00688bd26039
diff --cc lib/lmb.c
index 981ea1b2ca0,61bb13dc4e2..bb6f232f6bc
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@@ -739,10 -703,18 +739,10 @@@ phys_addr_t lmb_alloc(phys_size_t size
  phys_addr_t lmb_alloc_base(phys_size_t size, ulong align, phys_addr_t max_addr,
  			   uint flags)
  {
 -	phys_addr_t alloc;
 -
 -	alloc = _lmb_alloc_base(size, align, max_addr, flags);
 -
 -	if (alloc == 0)
 -		printf("ERROR: Failed to allocate 0x%lx bytes below 0x%lx.\n",
 -		       (ulong)size, (ulong)max_addr);
 -
 -	return alloc;
 +	return _lmb_alloc_base(size, align, max_addr, flags);
  }
  
- phys_addr_t lmb_alloc_addr(phys_addr_t base, phys_size_t size, u32 flags)
+ int lmb_alloc_addr(phys_addr_t base, phys_size_t size, u32 flags)
  {
  	long rgn;
  	struct lmb_region *lmb_memory = lmb.available_mem.data;