diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig | 2 | ||||
| -rw-r--r-- | lib/logo/Makefile | 12 | ||||
| -rw-r--r-- | lib/string.c | 13 |
3 files changed, 19 insertions, 8 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 90552f3c27..887f50ff00 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -111,7 +111,7 @@ config LIBFDT config RATP select CRC_ITU_T - select COMPILE_MEMORY + select DEV_MEM select COMMAND_SUPPORT select POLLER depends on CONSOLE_FULL diff --git a/lib/logo/Makefile b/lib/logo/Makefile index bf700da89b..4149d4ff6c 100644 --- a/lib/logo/Makefile +++ b/lib/logo/Makefile @@ -21,7 +21,7 @@ extra-y += $(patsubst %,%.bblogo.o,$(bblogo-y)) obj-$(CONFIG_BAREBOX_LOGO) += logo.o -quiet_cmd_logo_S = LOGO.S $@ +quiet_cmd_logo_S = LOGO.S $@ cmd_logo_S = \ ( \ echo '\#include <asm-generic/barebox.lds.h>'; \ @@ -38,17 +38,15 @@ cmd_logo_S = \ %.bblogo.S: %.bblogo FORCE $(call if_changed,logo_S) -# Inkscape 0.92.4 supports -z but Inkscape 1.0 doesn't -INKSCAPEOPTS += $(call try-run, inkscape -z,-z,) -# Inkscape 0.92.4 uses -e but Inkscape 1.0 uses --export-type=png -INKSCAPEOPTS += $(call try-run, inkscape -e -,-e -,--export-type=png) +# Inkscape 0.92.4 supports -z -e but Inkscape 1.0 uses --export-type=png +INKSCAPEOPTS += $(call try-run, inkscape -z -e -,-z -e -,--export-type=png) # Inkscape 1.0 supports -o - INKSCAPEOPTS += $(call try-run, inkscape -o -,-o -,) -quiet_cmd_logo = LOGO.S $@ +quiet_cmd_logo = LOGO.S $@ cmd_logo = \ ( \ - DISPLAY="" inkscape $(OPTS_$(@F)) $(INKSCAPEOPTS) $< > $@; \ + inkscape $(OPTS_$(@F)) $(INKSCAPEOPTS) $< > $@; \ ) %.bblogo: $(srctree)/Documentation/barebox.svg FORCE diff --git a/lib/string.c b/lib/string.c index 003070fa53..d250e58643 100644 --- a/lib/string.c +++ b/lib/string.c @@ -100,6 +100,19 @@ char * strcpy(char * dest,const char *src) #endif EXPORT_SYMBOL(strcpy); +/** + * stpcpy - Copy a %NUL terminated string, but return pointer to %NUL + * @dest: Where to copy the string to + * @src: Where to copy the string from + */ +char *stpcpy(char *dest, const char *src) +{ + while ((*dest++ = *src++) != '\0') + /* nothing */; + return dest - 1; +} +EXPORT_SYMBOL(stpcpy); + #ifndef __HAVE_ARCH_STRNCPY /** * strncpy - Copy a length-limited, %NUL-terminated string |