last steps to support pp_printf (still disabled)

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

last steps to support pp_printf (still disabled)
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
aa08158c · Alessandro Rubini · a502f9db · aa08158c · aa08158c · aa08158c
Commit aa08158c authored Oct 20, 2012 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 26 additions and 1 deletion

Kconfig Kconfig +9 -0

Makefile Makefile +2 -1

printf.mk pp_printf/printf.mk +15 -0

No files found.
--- a/Kconfig
+++ b/Kconfig
@@ -5,6 +5,15 @@ config MPRINTF
 	boolean
 	default y
+config PP_PRINTF
+       boolean
+       default !MPRINTF
+config PRINT_BUFSIZE
+       depends on PP_PRINTF
+       int "Size for the temporary output string of pp_printf"
+       default 128
 config ETHERBONE
 	boolean "Compile Etherbone support in wrpc-sw"
 	help

--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ obj-y += wrc_main.o wrc_ptp.o monitor/monitor.o
 cflags-y = -include $(CURDIR)/include/generated/autoconf.h \
 	-Iinclude -I.
-cflags-$(CONFIG_PP_PRINTF) += -I $(CURDIR)/pp_printf
+cflags-$(CONFIG_PP_PRINTF) += -I$(CURDIR)/pp_printf
 cflags-$(CONFIG_PTP_NOPOSIX) += \
 	-ffreestanding \
@@ -61,6 +61,7 @@ LDFLAGS_PLATFORM = -mmultiply-enabled -mbarrel-shift-enabled \
 include shell/shell.mk
 include tests/tests.mk
 include lib/lib.mk
+include pp_printf/printf.mk
 include sockitowm/sockitowm.mk
 include dev/dev.mk

--- a/pp_printf/printf.mk
+++ b/pp_printf/printf.mk
+# This is included from ../Makefile, for the wrc build system.
+# The Makefile in this directory is preserved from the upstream version
+obj-$(CONFIG_PP_PRINTF) += pp_printf/printf.o
+ppprintf-$(CONFIG_PRINTF_FULL) += pp_printf/vsprintf-full.o
+ppprintf-$(CONFIG_PRINTF_MINI) += pp_printf/vsprintf-mini.o
+ppprintf-$(CONFIG_PRINTF_NONE) += pp_printf/vsprintf-none.o
+ppprintf-$(CONFIG_PRINTF_XINT) += pp_printf/vsprintf-xint.o
+ppprintf-y ?= pp_printf/vsprintf-xint.o
+obj-$(CONFIG_PP_PRINTF) += $(ppprintf-y)