mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 08:42:12 +02:00
Avoid initrd and logbuffer area overlaps
Add logbuffer to reserved LMB areas to prevent initrd allocation from overlaping with it. Make sure to use correct logbuffer base address. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
This commit is contained in:
committed by
Wolfgang Denk
parent
6956d53d99
commit
95d449ad4d
@@ -35,6 +35,10 @@
|
||||
#include <dataflash.h>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_LOGBUFFER
|
||||
#include <logbuff.h>
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
|
||||
#include <rtc.h>
|
||||
#endif
|
||||
@@ -1013,6 +1017,12 @@ int boot_ramdisk_high (struct lmb *lmb, ulong rd_data, ulong rd_len,
|
||||
initrd_high = ~0;
|
||||
}
|
||||
|
||||
|
||||
#ifdef CONFIG_LOGBUFFER
|
||||
/* Prevent initrd from overwriting logbuffer */
|
||||
lmb_reserve(lmb, logbuffer_base() - LOGBUFF_OVERHEAD, LOGBUFF_RESERVE);
|
||||
#endif
|
||||
|
||||
debug ("## initrd_high = 0x%08lx, copy_to_ram = %d\n",
|
||||
initrd_high, initrd_copy_to_ram);
|
||||
|
||||
|
Reference in New Issue
Block a user