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

For odroid-c2 (arch-meson) for now disable designware eth as meson
now needs to do some harder GPIO work.

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
	lib/efi_loader/efi_disk.c

Modified:
	configs/odroid-c2_defconfig

diff --cc common/spl/spl_mmc.c
Simple merge

diff --cc configs/odroid-c2_defconfig
index a771b20f5fbb75f696d92107ef21e4ca23113609,0000000000000000000000000000000000000000..483d4900b78ae512929a171be02a34c9d252e62f
mode 100644,000000..100644
--- 1/configs/odroid-c2_defconfig
--- /dev/null
+++ b/configs/odroid-c2_defconfig
@@@ -1,23 -1,0 +1,22 @@@
- CONFIG_ETH_DESIGNWARE=y
 +CONFIG_ARM=y
 +CONFIG_ARCH_MESON=y
 +CONFIG_MESON_GXBB=y
 +CONFIG_TARGET_ODROID_C2=y
 +CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-odroidc2"
 +# CONFIG_CMD_BDI is not set
 +# CONFIG_CMD_IMI is not set
 +# CONFIG_CMD_IMLS is not set
 +# CONFIG_CMD_LOADS is not set
 +# CONFIG_CMD_FPGA is not set
 +# CONFIG_CMD_SOURCE is not set
 +# CONFIG_CMD_SETEXPR is not set
 +CONFIG_OF_CONTROL=y
 +CONFIG_NET_RANDOM_ETHADDR=y
 +CONFIG_DM_ETH=y
 +CONFIG_DEBUG_UART=y
 +CONFIG_DEBUG_UART_MESON=y
 +CONFIG_DEBUG_UART_BASE=0xc81004c0
 +CONFIG_DEBUG_UART_CLOCK=24000000
 +CONFIG_DEBUG_UART_ANNOUNCE=y
 +CONFIG_DEBUG_UART_SKIP_INIT=y
 +CONFIG_MESON_SERIAL=y

diff --cc drivers/clk/clk_rk3288.c
Simple merge

diff --cc include/efi_loader.h
index b1ca4ba26b668ed70259e32633d2b0a89ff62c29,44a950f4842e590ccf1af1d9ae0c4816c6073755..3332d61cefc9fc5754f45e9732b5aebc3f557441
--- 1/include/efi_loader.h
--- 2/include/efi_loader.h
+++ b/include/efi_loader.h
@@@ -139,13 -133,8 +139,13 @@@ uint64_t efi_add_memory_map(uint64_t st
  /* Called by board init to initialize the EFI memory map */
  int efi_memory_init(void);
  
 +#ifdef CONFIG_EFI_LOADER_BOUNCE_BUFFER
 +extern void *efi_bounce_buffer;
 +#define EFI_LOADER_BOUNCE_BUFFER_SIZE (64 * 1024 * 1024)
 +#endif
 +
  /* Convert strings from normal C strings to uEFI strings */
- static inline void ascii2unicode(u16 *unicode, char *ascii)
+ static inline void ascii2unicode(u16 *unicode, const char *ascii)
  {
        while (*ascii)
                *(unicode++) = *(ascii++);

diff --cc lib/efi_loader/efi_disk.c
Simple merge