Merge with git://www.denx.de/git/u-boot.git

diff --cc Makefile
index 15dec1749ce2aa18298df1a7ed63dfbf275e360a,94cda54c731f19e08bb04c207ca7beb8d85e8020..42a65a0ec708141ba25f27e71da05f2b4addfcfd
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -222,6 -219,8 +222,7 @@@ LIBS += $(shell if [ -d post/cpu/$(CPU
  LIBS += $(shell if [ -d post/board/$(BOARDDIR) ]; then echo \
        "post/board/$(BOARDDIR)/libpost$(BOARD).a"; fi)
  LIBS += common/libcommon.a
 -LIBS += $(BOARDLIBS)
+ LIBS += libfdt/libfdt.a
  
  LIBS := $(addprefix $(obj),$(LIBS))
  .PHONY : $(LIBS)