Merge branch 'master' of git://www.denx.de/git/u-boot-blackfin

Conflicts:

	Makefile
	doc/README.standalone

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --cc .gitignore
Simple merge

diff --cc Makefile
index 969ce42ec06266767ef179ac00e051e937220a4c,b4a39945bf05eb65cfce6d4e3cd06ab4fbed0ee2..f80e5113ca00f8bcab0c8225515629e4dc211d85
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -285,7 -273,10 +273,10 @@@ __LIBS := $(subst $(obj),,$(LIBS)
  #########################################################################
  #########################################################################
  
 -ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND)
 +ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND) $(U_BOOT_ONENAND)
+ ifeq ($(ARCH),blackfin)
+ ALL += $(obj)u-boot.ldr
+ endif
  
  all:          $(ALL)
  

diff --cc README
Simple merge

diff --cc common/cmd_bdinfo.c
Simple merge

diff --cc common/cmd_mem.c
Simple merge

diff --cc config.mk
Simple merge

diff --cc doc/README.standalone
index f9237a65f573a529c62b23769978f5c2dbdcb467,3495f54f588474b1194a6f4da33f671caea6028b..81b949a0aaad4ccdf9d1115add30dc27b9fb6abe
--- 1/doc/README.standalone
--- 2/doc/README.standalone
+++ b/doc/README.standalone
@@@ -19,11 -19,11 +19,12 @@@ Design Notes on Exporting U-Boot Functi
     thus the compiler cannot perform type checks on these assignments.
  
  2. The pointer to the jump table is passed to the application in a
-    machine-dependent way. PowerPC, ARM and MIPS architectures use a
-    dedicated register to hold the pointer to the 'global_data'
-    structure: r2 on PowerPC, r8 on ARM and k0 on MIPS. The x86
-    architecture does not use such a register; instead, the pointer to
-    the 'global_data' structure is passed as 'argv[-1]' pointer.
+    machine-dependent way. PowerPC, ARM, MIPS and Blackfin architectures
+    use a dedicated register to hold the pointer to the 'global_data'
 -   structure: r29 on PowerPC, r8 on ARM, k0 on MIPS, and P5 on Blackfin.
 -   The x86 architecture does not use such a register; instead, the pointer
 -   to the 'global_data' structure is passed as 'argv[-1]' pointer.
++   structure: r2 on PowerPC, r8 on ARM, k0 on MIPS, and P5 on Blackfin.
++   The x86 architecture does not use such a register; instead, the
++   pointer to the 'global_data' structure is passed as 'argv[-1]'
++   pointer.
  
     The application can access the 'global_data' structure in the same
     way as U-Boot does:

diff --cc include/common.h
Simple merge