From: Tom Rini <trini@konsulko.com>
Date: Fri, 27 May 2016 19:49:43 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-dm
X-Git-Tag: v2025.01-rc5-pxa1908~9324
X-Git-Url: http://git.dujemihanovic.xyz/img/html/static/git-favicon.png?a=commitdiff_plain;h=e4a94ce4ac77396b181663c0493c50bc2d5b9143;p=u-boot.git

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
---

e4a94ce4ac77396b181663c0493c50bc2d5b9143
diff --cc configs/odroid-c2_defconfig
index a771b20f5f,0000000000..483d4900b7
mode 100644,000000..100644
--- a/configs/odroid-c2_defconfig
+++ b/configs/odroid-c2_defconfig
@@@ -1,23 -1,0 +1,22 @@@
 +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_ETH_DESIGNWARE=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 include/efi_loader.h
index b1ca4ba26b,44a950f484..3332d61cef
--- a/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++);