On Tue, Aug 8, 2017 at 12:56 PM, Heinrich Schuchardt <xypron.g...@gmx.de> wrote: > On 08/06/2017 01:39 PM, Rob Clark wrote: >> This works (roughly) the same way as linux's, but we currently always >> print lower-case (ie. we just keep %pUB and %pUL for compat with linux), >> mostly just because that is what uuid_bin_to_str() supports. >> >> %pUb: 01020304-0506-0708-090a-0b0c0d0e0f10 >> %pUl: 04030201-0605-0807-090a-0b0c0d0e0f10 >> >> It will be used by a later efi_loader paths for efi variables and for >> device-path-to-text protocol, and also quite useful for debug prints >> of protocol GUIDs. >> >> Signed-off-by: Rob Clark <robdcl...@gmail.com> >> --- >> This replaces "efi_loader: add guidstr helper" in my "enough UEFI for >> standard distro boot" patchset, and could also replace Heinrich's >> "efi_loader: write protocol GUID in OpenProtocol" with a single one- >> line debug() print. >> >> include/config_fallbacks.h | 1 + >> lib/vsprintf.c | 46 >> ++++++++++++++++++++++++++++++++++++++++++++-- >> 2 files changed, 45 insertions(+), 2 deletions(-) >> [snip] > I was not able to apply the patch to v2017.09-rc1 nor to git HEAD. > > Applying: vsprintf.c: add GUID printing > error: patch failed: lib/vsprintf.c:18 > error: lib/vsprintf.c: patch does not apply > > This is my lib/vsprintf.c: > 14 #include <stdarg.h> > 15 #include <linux/types.h> > 16 #include <linux/string.h> > 17 #include <linux/ctype.h> > 18 > 19 #include <common.h> > 20 > 21 #include <div64.h> > > There is no line with #include <charset.h>.
that comes from the previous patch which adds utf16 support.. I think that should be the only conflicting hunk, the later bits are far enough away from the utf16 related hunks. BR, -R _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot