Merge git://git.denx.de/u-boot-dm

3 files changed, 33 insertions, 12 deletions

diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig
index 53acee05fa..f332480e1d 100644
--- a/drivers/core/Kconfig
+++ b/drivers/core/Kconfig
@@ -155,7 +155,7 @@ config OF_TRANSLATE
 	  smaller in size than fdt_translate_address().
 
 config SPL_OF_TRANSLATE
-	bool "Translate addresses using fdt_translate_address"
+	bool "Translate addresses using fdt_translate_address in SPL"
 	depends on SPL_DM && SPL_OF_CONTROL
 	default n
 	help
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 842f78bff3..4bf9a5c681 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -64,9 +64,9 @@ static void serial_find_console_or_panic(void)
 		}
 
 		/*
-		* If the console is not marked to be bound before relocation,
-		* bind it anyway.
-		*/
+		 * If the console is not marked to be bound before relocation,
+		 * bind it anyway.
+		 */
 		if (node > 0 &&
 		    !lists_bind_fdt(gd->dm_root, blob, node, &dev)) {
 			if (!device_probe(dev)) {
@@ -77,13 +77,13 @@ static void serial_find_console_or_panic(void)
 	}
 	if (!SPL_BUILD || !CONFIG_IS_ENABLED(OF_CONTROL) || !blob) {
 		/*
-		* Try to use CONFIG_CONS_INDEX if available (it is numbered
-		* from 1!).
-		*
-		* Failing that, get the device with sequence number 0, or in
-		* extremis just the first serial device we can find. But we
-		* insist on having a console (even if it is silent).
-		*/
+		 * Try to use CONFIG_CONS_INDEX if available (it is numbered
+		 * from 1!).
+		 *
+		 * Failing that, get the device with sequence number 0, or in
+		 * extremis just the first serial device we can find. But we
+		 * insist on having a console (even if it is silent).
+		 */
 #ifdef CONFIG_CONS_INDEX
 #define INDEX (CONFIG_CONS_INDEX - 1)
 #else
diff --git a/tools/buildman/README b/tools/buildman/README
index 10c7135b5f..66502af62e 100644
--- a/tools/buildman/README
+++ b/tools/buildman/README
@@ -156,7 +156,6 @@ aarch64: /opt/linaro/gcc-linaro-aarch64-none-elf-4.8-2013.10_linux
 [toolchain-alias]
 x86: i386
 blackfin: bfin
-sh: sh4
 nds32: nds32le
 openrisc: or32
 
@@ -341,6 +340,28 @@ Testing
          - found '/home/sjg/.buildman-toolchains/gcc-4.5.1-nolibc/or32-linux/bin/or32-linux-gcc'
 Tool chain test:  OK
 
+Or download them all from kernel.org and move them to /toolchains directory,
+
+$ for i in aarch64 arm avr32 i386 m68k microblaze mips or32 powerpc sparc
+  do
+  ./tools/buildman/buildman --fetch-arch $i
+  done
+$ sudo mkdir -p /toolchains
+$ sudo mv ~/.buildman-toolchains/*/* /toolchains/
+
+For those not available from kernel.org, download from the following links.
+
+arc: https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/
+    arc_gnu_2015.06_prebuilt_uclibc_le_archs_linux_install.tar.gz
+blackfin: http://sourceforge.net/projects/adi-toolchain/files/
+    blackfin-toolchain-elf-gcc-4.5-2014R1_45-RC2.x86_64.tar.bz2
+nds32: http://osdk.andestech.com/packages/
+    nds32le-linux-glibc-v1.tgz
+nios2: http://sourcery.mentor.com/public/gnu_toolchain/nios2-linux-gnu/
+    sourceryg++-2015.11-27-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2
+sh: http://sourcery.mentor.com/public/gnu_toolchain/sh-linux-gnu/
+    renesas-4.4-200-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
+
 Buildman should now be set up to use your new toolchain.
 
 At the time of writing, U-Boot has these architectures: