dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix serious pointer bug with bootm and reserve map.

Browse Source 
What was suppose to be a stack variable was declared as a pointer,
  overwriting random memory.
Also moved the libfdt.a requirement into the main Makefile.  That is
  The U-Boot Way.
This commit is contained in:
Gerald Van Baren
2007-04-19 23:14:39 -04:00
parent 37837828d8
commit 7651f8bdbb
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -219,6 +219,7 @@ LIBS += $(shell if [ -d post/cpu/$(CPU) ]; then echo \
LIBS += $(shell if [ -d post/board/$(BOARDDIR) ]; then echo \ LIBS += $(shell if [ -d post/board/$(BOARDDIR) ]; then echo \
"post/board/$(BOARDDIR)/libpost$(BOARD).a"; fi) "post/board/$(BOARDDIR)/libpost$(BOARD).a"; fi)
LIBS += common/libcommon.a LIBS += common/libcommon.a
LIBS += libfdt/libfdt.a
LIBS += $(BOARDLIBS) LIBS += $(BOARDLIBS)
LIBS := $(addprefix $(obj),$(LIBS)) LIBS := $(addprefix $(obj),$(LIBS))

5
board/mpc8360emds/config.mk
View File

@@ -26,8 +26,3 @@
# #
TEXT_BASE = 0xFE000000 TEXT_BASE = 0xFE000000
#
# Additional board-specific libraries
#
BOARDLIBS = libfdt/libfdt.a

4
common/fdt_support.c
View File

@@ -56,7 +56,7 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
} }
if (initrd_start && initrd_end) { if (initrd_start && initrd_end) {
struct fdt_reserve_entry *re; struct fdt_reserve_entry re;
int used; int used;
int total; int total;
int j; int j;
@@ -77,7 +77,7 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
*/ */
for (j = 0; j < used; j++) { for (j = 0; j < used; j++) {
err = fdt_get_reservemap(fdt, j, &re); err = fdt_get_reservemap(fdt, j, &re);
if (re->address == initrd_start) { if (re.address == initrd_start) {
break; break;
} }
} }