Merge git://git.denx.de/u-boot-net
diff --git a/.gitignore b/.gitignore
index f6f5dae..29757aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,14 +57,6 @@
/include/config/
/include/generated/
-# Since "ee95d10 fdt: Build the new python libfdt module", a number of
-# build artifacts and intermediated from the python libfdt module are
-# installed into the /tools directory.
-/tools/_libfdt.so
-/tools/libfdt.py
-/tools/libfdt.pyc
-/tools/libfdt_wrap.c
-
# stgit generated dirs
patches-*
.stgit-edit.txt
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 9446cd9..b05ec21 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -696,7 +696,7 @@
bool "Support ARM Trusted Firmware"
depends on ARM64
help
- ATF(ARM Trusted Firmware) is a component for ARM arch64 which which
+ ATF(ARM Trusted Firmware) is a component for ARM arch64 which
is loaded by SPL(which is considered as BL2 in ATF terminology).
More detail at: https://github.com/ARM-software/arm-trusted-firmware
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index 10e8318..848aeb7 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -16,6 +16,7 @@
CONFIG_ENV_FAT_INTERFACE="mmc"
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_DM_KEYBOARD=y
+CONFIG_OF_EMBED=y
CONFIG_DM_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_BCM2835=y
diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
index d35a639..196b619 100644
--- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig
@@ -17,6 +17,7 @@
CONFIG_ENV_FAT_INTERFACE="mmc"
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_DM_KEYBOARD=y
+CONFIG_OF_EMBED=y
CONFIG_DM_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_BCM2835=y
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
index 095a076..f23c1e7 100644
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -17,6 +17,7 @@
CONFIG_ENV_FAT_INTERFACE="mmc"
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_DM_KEYBOARD=y
+CONFIG_OF_EMBED=y
CONFIG_DM_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_BCM2835=y
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index 9dfdad5..9398706 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -16,6 +16,7 @@
CONFIG_ENV_FAT_INTERFACE="mmc"
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
CONFIG_DM_KEYBOARD=y
+CONFIG_OF_EMBED=y
CONFIG_DM_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_BCM2835=y
diff --git a/disk/part_mac.c b/disk/part_mac.c
index d597dcf..e31bc90 100644
--- a/disk/part_mac.c
+++ b/disk/part_mac.c
@@ -159,15 +159,11 @@
mac_driver_desc_t *ddb_p)
{
if (blk_dread(dev_desc, 0, 1, (ulong *)ddb_p) != 1) {
- printf("** Can't read Driver Descriptor Block **\n");
+ debug("** Can't read Driver Descriptor Block **\n");
return (-1);
}
if (ddb_p->signature != MAC_DRIVER_MAGIC) {
-#if 0
- printf ("** Bad Signature: expected 0x%04x, got 0x%04x\n",
- MAC_DRIVER_MAGIC, ddb_p->signature);
-#endif
return (-1);
}
return (0);
diff --git a/doc/README.gpt b/doc/README.gpt
index 517df55..d3db8bc 100644
--- a/doc/README.gpt
+++ b/doc/README.gpt
@@ -236,16 +236,6 @@
=>host bind 0 ./disk.raw
=> gpt read host 0
[ . . . ]
-=> gpt flip host 0
-[ . . . ]
-
-The GPT functionality may be tested with the 'sandbox' board by
-creating a disk image as described under 'Block Device Emulation' in
-board/sandbox/README.sandbox:
-
-=>host bind 0 ./disk.raw
-=> gpt read host 0
-[ . . . ]
=> gpt swap host 0 name othername
[ . . . ]
diff --git a/include/linker_lists.h b/include/linker_lists.h
index 76898ab..6ef89a2 100644
--- a/include/linker_lists.h
+++ b/include/linker_lists.h
@@ -14,8 +14,7 @@
#include <linux/compiler.h>
/*
- * There is no use in including this from ASM files, but that happens
- * anyway, e.g. PPC kgdb.S includes command.h which incluse us.
+ * There is no use in including this from ASM files.
* So just don't define anything when included from ASM.
*/
diff --git a/include/vsprintf.h b/include/vsprintf.h
index e38076d..490c96c 100644
--- a/include/vsprintf.h
+++ b/include/vsprintf.h
@@ -112,12 +112,10 @@
* Format a string and place it in a buffer (va_list version)
*
* @param buf The buffer to place the result into
- * @param size The size of the buffer, including the trailing null space
* @param fmt The format string to use
* @param args Arguments for the format string
* @return the number of characters which have been written into
- * the @buf not including the trailing '\0'. If @size is == 0 the function
- * returns 0.
+ * the @buf not including the trailing '\0'.
*
* If you're not already dealing with a va_list consider using scnprintf().
*
diff --git a/tools/.gitignore b/tools/.gitignore
index ac0c979..5293d44 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,31 +1,34 @@
+/_libfdt.so
/atmel_pmecc_params
/bin2header
/bmp_logo
+/common/
+/dumpimage
+/easylogo/easylogo
/envcrc
/fdtgrep
/fit_check_sign
/fit_info
+/gdb/gdbcont
+/gdb/gdbsend
/gen_eth_addr
/gen_ethaddr_crc
/ifdtool
/img2srec
/kwboot
-/dumpimage
+/lib/
+/libfdt.py
+/libfdt.pyc
+/libfdt_wrap.c
/mips-relocs
/mkenvimage
-/mkimage
/mkexynosspl
-/mxsboot
+/mkimage
/mksunxiboot
-/sunxi-spl-image-builder
+/mxsboot
/ncb
/proftool
/relocate-rela
+/sunxi-spl-image-builder
/ubsha1
/xway-swap-bytes
-/easylogo/easylogo
-/gdb/gdbcont
-/gdb/gdbsend
-
-/lib/
-/common/