Skip to content

S
Software for White Rabbit PTP Core
Commit affb4139 authored by Alessandro Rubini's avatar Alessandro Rubini Committed by Adam Wujek
Browse files
Options

Kconfig: fix warnings 

The new config tools are more picky. We got:

   Kconfig:22:warning: defaults for choice values not supported

and

  warning: (WR_SWITCH) selects UART which has unmet direct dependencies
             (DEVELOPER && EMBEDDED_NODE)

The latter is fixed adding WR_SWITCH in the dependencies. The former
is worked-around by using "IS_XINT" and friends in "choice", and
then "XINT" replicates the "IS_" choice.  I dislike it, because it's
repetition, but we really need CONFIG_PRINTF_XINT and friends in
pp_printf/
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent e10d4071
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 9 deletions
Kconfig
View file @ affb4139
...@@ -17,10 +17,6 @@ config PRINT_BUFSIZE ...@@ -17,10 +17,6 @@ config PRINT_BUFSIZE
int int
default 128 default 128
config PRINTF_XINT
boolean
default y
config RAMSIZE config RAMSIZE
int int
default 65536 if WR_SWITCH default 65536 if WR_SWITCH
...@@ -295,7 +291,7 @@ choice ...@@ -295,7 +291,7 @@ choice
prompt "Implementation of pp_printf" prompt "Implementation of pp_printf"
depends on DEVELOPER && WR_NODE depends on DEVELOPER && WR_NODE
config PRINTF_XINT config PRINTF_IS_XINT
bool "hex-and-int" bool "hex-and-int"
help help
This selects a printf that can only print decimal and hex This selects a printf that can only print decimal and hex
...@@ -303,7 +299,7 @@ config PRINTF_XINT ...@@ -303,7 +299,7 @@ config PRINTF_XINT
supported too, and %p is equivalent to %x. supported too, and %p is equivalent to %x.
See pp_printf/README for details. See pp_printf/README for details.
config PRINTF_FULL config PRINTF_IS_FULL
bool "full" bool "full"
help help
This selects an implementation that supports all standard This selects an implementation that supports all standard
...@@ -311,7 +307,7 @@ config PRINTF_FULL ...@@ -311,7 +307,7 @@ config PRINTF_FULL
around 2k of compiled code more than XINT. around 2k of compiled code more than XINT.
See pp_printf/README for details. See pp_printf/README for details.
config PRINTF_MINI config PRINTF_IS_MINI
bool "minimal" bool "minimal"
help help
This selects a printf that prints all integers as hex, This selects a printf that prints all integers as hex,
...@@ -319,7 +315,7 @@ config PRINTF_MINI ...@@ -319,7 +315,7 @@ config PRINTF_MINI
supported too. See pp_printf/README for details. supported too. See pp_printf/README for details.
This is not probably what you want for wrpc-sw. This is not probably what you want for wrpc-sw.
config PRINTF_NONE config PRINTF_IS_NONE
bool "empty" bool "empty"
help help
This selects a printf that prints the format string This selects a printf that prints the format string
...@@ -327,6 +323,23 @@ config PRINTF_NONE ...@@ -327,6 +323,23 @@ config PRINTF_NONE
but not suited for wrpc-sw. See pp_printf/README for details. but not suited for wrpc-sw. See pp_printf/README for details.
endchoice endchoice
config PRINTF_XINT
boolean
default PRINTF_IS_XINT if (DEVELOPER && WR_NODE)
default y
config PRINTF_FULL
boolean
default PRINTF_IS_FULL
config PRINTF_MINI
boolean
default PRINTF_IS_MINI
config PRINTF_NONE
boolean
default PRINTF_IS_NONE
config PPSI config PPSI
depends on WR_NODE depends on WR_NODE
boolean boolean
...@@ -348,7 +361,7 @@ config DETERMINISTIC_BINARY ...@@ -348,7 +361,7 @@ config DETERMINISTIC_BINARY
config UART config UART
boolean "Use hardware uart (and/or vuart if available)" boolean "Use hardware uart (and/or vuart if available)"
depends on DEVELOPER && EMBEDDED_NODE depends on (DEVELOPER && EMBEDDED_NODE) || WR_SWITCH
help help
This option selects the serial driver, connected to either This option selects the serial driver, connected to either
the USB socket, or "vuart" (software fifo) or both, according the USB socket, or "vuart" (software fifo) or both, according
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment