Merge branch 'next'

diff --combined README
index 39e05d333c672b5183908a4016ad223641ca023a,fd717bf085fab6a44b4a41c7b833e978cbaed897..52a92e73b8e161126264aea58b4977119047c16d
--- 1/README
--- 2/README
+++ b/README
@@@ -566,8 -566,6 +566,8 @@@ The following options need to be config
                CONFIG_ARM_ERRATA_742230
                CONFIG_ARM_ERRATA_743622
                CONFIG_ARM_ERRATA_751472
 +              CONFIG_ARM_ERRATA_794072
 +              CONFIG_ARM_ERRATA_761320
  
                If set, the workarounds for these ARM errata are applied early
                during U-Boot startup. Note that these options force the
@@@ -912,6 -910,7 +912,7 @@@
                The default command configuration includes all commands
                except those marked below with a "*".
  
+               CONFIG_CMD_AES            AES 128 CBC encrypt/decrypt
                CONFIG_CMD_ASKENV       * ask for env variable
                CONFIG_CMD_BDI            bdinfo
                CONFIG_CMD_BEDBUG       * Include BedBug Debugger
@@@ -1014,7 -1013,7 +1015,7 @@@
                CONFIG_CMD_CDP          * Cisco Discover Protocol support
                CONFIG_CMD_MFSL         * Microblaze FSL support
                CONFIG_CMD_XIMG           Load part of Multi Image
 -
 +              CONFIG_CMD_UUID         * Generate random UUID or GUID string
  
                EXAMPLE: If you want all functions except of network
                support you can write:
@@@ -1527,16 -1526,6 +1528,16 @@@
                this to the maximum filesize (in bytes) for the buffer.
                Default is 4 MiB if undefined.
  
 +              DFU_DEFAULT_POLL_TIMEOUT
 +              Poll timeout [ms], is the timeout a device can send to the
 +              host. The host must wait for this timeout before sending
 +              a subsequent DFU_GET_STATUS request to the device.
 +
 +              DFU_MANIFEST_POLL_TIMEOUT
 +              Poll timeout [ms], which the device sends to the host when
 +              entering dfuMANIFEST state. Host waits this timeout, before
 +              sending again an USB request to the device.
 +
  - Journaling Flash filesystem support:
                CONFIG_JFFS2_NAND, CONFIG_JFFS2_NAND_OFF, CONFIG_JFFS2_NAND_SIZE,
                CONFIG_JFFS2_NAND_DEV

diff --combined common/Makefile
index cecd81a9a08e8b986d7828e2d04ccbd559c75e8e,c49a0af28d5c86000941b0957f937cf131d3cdf2..7c853ae4422bf331e98813555ffa2c0d62a02ce9
--- 1/common/Makefile
--- 2/common/Makefile
+++ b/common/Makefile
@@@ -48,6 -48,7 +48,7 @@@ obj-$(CONFIG_ENV_IS_IN_UBI) += env_ubi.
  obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
  
  # command
+ obj-$(CONFIG_CMD_AES) += cmd_aes.o
  obj-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o
  obj-$(CONFIG_SOURCE) += cmd_source.o
  obj-$(CONFIG_CMD_SOURCE) += cmd_source.o
@@@ -159,9 -160,6 +160,9 @@@ obj-$(CONFIG_CMD_UBI) += cmd_ubi.
  obj-$(CONFIG_CMD_UBIFS) += cmd_ubifs.o
  obj-$(CONFIG_CMD_UNIVERSE) += cmd_universe.o
  obj-$(CONFIG_CMD_UNZIP) += cmd_unzip.o
 +ifdef CONFIG_LZMA
 +obj-$(CONFIG_CMD_LZMADEC) += cmd_lzmadec.o
 +endif
  ifdef CONFIG_CMD_USB
  obj-y += cmd_usb.o
  obj-y += usb.o usb_hub.o

diff --combined lib/fdtdec.c
index 33265ecfb26cb3d378dc78141f1fd4680b0efe0b,8da2d74041da295ca9cc3cad6a7fdea68bb0c974..8ecb80f1623bfb95ca02ee8c4be133818be0b87d
--- 1/lib/fdtdec.c
--- 2/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@@ -3,6 -3,7 +3,7 @@@
   * SPDX-License-Identifier:   GPL-2.0+
   */
  
+ #ifndef USE_HOSTCC
  #include <common.h>
  #include <serial.h>
  #include <libfdt.h>
@@@ -52,10 -53,8 +53,10 @@@ static const char * const compat_names[
        COMPAT(SAMSUNG_EXYNOS5_USB3_PHY, "samsung,exynos5250-usb3-phy"),
        COMPAT(SAMSUNG_EXYNOS_TMU, "samsung,exynos-tmu"),
        COMPAT(SAMSUNG_EXYNOS_FIMD, "samsung,exynos-fimd"),
 +      COMPAT(SAMSUNG_EXYNOS_MIPI_DSI, "samsung,exynos-mipi-dsi"),
        COMPAT(SAMSUNG_EXYNOS5_DP, "samsung,exynos5-dp"),
        COMPAT(SAMSUNG_EXYNOS5_DWMMC, "samsung,exynos5250-dwmmc"),
 +      COMPAT(SAMSUNG_EXYNOS_MMC, "samsung,exynos-mmc"),
        COMPAT(SAMSUNG_EXYNOS_SERIAL, "samsung,exynos4210-uart"),
        COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"),
        COMPAT(GENERIC_SPI_FLASH, "spi-flash"),
@@@ -645,3 -644,22 +646,22 @@@ int fdtdec_read_fmap_entry(const void *
  
        return 0;
  }
+ #else
+ #include "libfdt.h"
+ #include "fdt_support.h"
+ 
+ int fdtdec_get_int(const void *blob, int node, const char *prop_name,
+               int default_val)
+ {
+       const int *cell;
+       int len;
+ 
+       cell = fdt_getprop_w((void *)blob, node, prop_name, &len);
+       if (cell && len >= sizeof(int)) {
+               int val = fdt32_to_cpu(cell[0]);
+ 
+               return val;
+       }
+       return default_val;
+ }
+ #endif