aboutsummaryrefslogtreecommitdiff
path: root/common/image.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-05-12 00:56:28 +0200
committerWolfgang Denk <wd@denx.de>2008-05-12 00:56:28 +0200
commitee0cfa70803a3e629ea581a9b216f8ecef402bfc (patch)
tree04fe5684e8cb6c4508b3afab2217e6478869f335 /common/image.c
parent02b9b22446e3d7ad6a6382be17a1ce79a7de589b (diff)
downloadu-boot-linaro-natty-ee0cfa70803a3e629ea581a9b216f8ecef402bfc.tar.gz
Revert "Avoid initrd and logbuffer area overlaps"
This reverts commit 1b5605ca57fbb364f4d78eeee28b974ed875e888 which breaks building on all PPC boards that don't use a log buffer.
Diffstat (limited to 'common/image.c')
-rw-r--r--common/image.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/common/image.c b/common/image.c
index 9e9e02342..67e594df6 100644
--- a/common/image.c
+++ b/common/image.c
@@ -35,10 +35,6 @@
#include <dataflash.h>
#endif
-#ifdef CONFIG_LOGBUFFER
-#include <logbuff.h>
-#endif
-
#if defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
#include <rtc.h>
#endif
@@ -1017,9 +1013,6 @@ int boot_ramdisk_high (struct lmb *lmb, ulong rd_data, ulong rd_len,
initrd_high = ~0;
}
- /* Prevent initrd from overwriting logbuffer */
- lmb_reserve(lmb, logbuffer_base() - LOGBUFF_OVERHEAD, LOGBUFF_RESERVE);
-
debug ("## initrd_high = 0x%08lx, copy_to_ram = %d\n",
initrd_high, initrd_copy_to_ram);