diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-27 15:49:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-27 20:34:12 -0400 |
| commit | e4a94ce4ac77396b181663c0493c50bc2d5b9143 (patch) | |
| tree | 7564e2d5e7e24841a763460f7eaf91409abd0312 /include/efi_loader.h | |
| parent | 378f9134eba4665ea94a63653393d25418665fda (diff) | |
| parent | 3c27b6ad540828c44a62d209030df5ba86896df0 (diff) | |
| download | blackbird-obmc-uboot-e4a94ce4ac77396b181663c0493c50bc2d5b9143.tar.gz blackbird-obmc-uboot-e4a94ce4ac77396b181663c0493c50bc2d5b9143.zip | |
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
Diffstat (limited to 'include/efi_loader.h')
| -rw-r--r-- | include/efi_loader.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/efi_loader.h b/include/efi_loader.h index b1ca4ba26b..3332d61cef 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -145,7 +145,7 @@ extern void *efi_bounce_buffer; #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++); |
