Skip to content

P
PPSi
Commit 9d23eba5 authored by Adam Wujek's avatar Adam Wujek
Browse files
Options

Kconfig: use ARCH_IS_WRPC instead of ARCH_WRPC for defaults/depend on 

Prompt "Architecture to build for", shall be avoided when Kconfig_ppsi
is included by WRPC's Kconfig. But then it is not possible to select ARCH_WRPC=y
Signed-off-by: 's avatarAdam Wujek <adam.wujek@creotech.pl>
parent 34df92c9
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 15 deletions
Kconfig_ppsi
View file @ 9d23eba5
...@@ -65,14 +65,14 @@ config ARCH ...@@ -65,14 +65,14 @@ config ARCH
default "unix" if ARCH_UNIX default "unix" if ARCH_UNIX
default "bare-i386" if ARCH_BARE_I386 default "bare-i386" if ARCH_BARE_I386
default "bare-x86-64" if ARCH_BARE_X86_64 default "bare-x86-64" if ARCH_BARE_X86_64
default "wrpc" if ARCH_WRPC default "wrpc" if ARCH_IS_WRPC=1
default "wrs" if ARCH_WRS default "wrs" if ARCH_WRS
default "sim" if ARCH_SIMULATOR default "sim" if ARCH_SIMULATOR
config CROSS_COMPILE config CROSS_COMPILE
string "Cross compiler prefix" string "Cross compiler prefix"
default "/opt/gcc-lm32/bin/lm32-elf-" if ARCH_WRPC default "/opt/gcc-lm32/bin/lm32-elf-" if ARCH_IS_WRPC=1
default "/opt/arm-wrswitch/bin/arm-linux-" if ARCH_WRS default "/opt/arm-wrswitch/bin/arm-linux-" if ARCH_WRS
default "" default ""
...@@ -108,7 +108,7 @@ menu "PTP Protocol Options" ...@@ -108,7 +108,7 @@ menu "PTP Protocol Options"
config E2E_ONLY config E2E_ONLY
boolean "Avoid building P2P code" boolean "Avoid building P2P code"
depends on E2E depends on E2E
default y if E2E && (ARCH_BARE_I386 || ARCH_BARE_X86_64 || ARCH_WRPC) default y if E2E && (ARCH_BARE_I386 || ARCH_BARE_X86_64 || ARCH_IS_WRPC=1)
help help
If you choose E2E above, P2P is built anyways, If you choose E2E above, P2P is built anyways,
and you can choose at runtime what to run. and you can choose at runtime what to run.
...@@ -121,7 +121,7 @@ menu "PTP Protocol Options" ...@@ -121,7 +121,7 @@ menu "PTP Protocol Options"
config LEAP_SECONDS_VAL config LEAP_SECONDS_VAL
int "Value of Leap Seconds" int "Value of Leap Seconds"
depends on ARCH_WRPC depends on ARCH_IS_WRPC=1
default 37 default 37
help help
Difference in seconds between TAI and UTC. Difference in seconds between TAI and UTC.
...@@ -131,7 +131,7 @@ menu "Enabled profiles" ...@@ -131,7 +131,7 @@ menu "Enabled profiles"
config PROFILE_WR config PROFILE_WR
bool "WhiteRabbit" bool "WhiteRabbit"
default y if ARCH_WRS || ARCH_WRPC default y if ARCH_WRS || ARCH_IS_WRPC=1
config PROFILE_HA config PROFILE_HA
bool "HighAccuracy" bool "HighAccuracy"
...@@ -258,7 +258,7 @@ config PPSI_ASSERT ...@@ -258,7 +258,7 @@ config PPSI_ASSERT
config NR_FOREIGN_RECORDS config NR_FOREIGN_RECORDS
int "Size of foreignMasterDS data set" int "Size of foreignMasterDS data set"
range 1 20 range 1 20
default 1 if ARCH_WRPC default 1 if ARCH_IS_WRPC=1
default 5 default 5
help help
Size of foreignMasterDS data set (Clause 9.3.2.4.5). Size of foreignMasterDS data set (Clause 9.3.2.4.5).
...@@ -273,7 +273,7 @@ config SINGLE_FMASTER ...@@ -273,7 +273,7 @@ config SINGLE_FMASTER
config NR_PORTS config NR_PORTS
int "Number of ports" int "Number of ports"
range 1 64 range 1 64
default 1 if ARCH_WRPC default 1 if ARCH_IS_WRPC=1
default 18 if ARCH_WRS default 18 if ARCH_WRS
default 64 default 64
help help
...@@ -282,7 +282,7 @@ config NR_PORTS ...@@ -282,7 +282,7 @@ config NR_PORTS
config NR_INSTANCES_PER_PORT config NR_INSTANCES_PER_PORT
int "Max instances per port" int "Max instances per port"
range 1 64 range 1 64
default 1 if ARCH_WRPC default 1 if ARCH_IS_WRPC=1
default 2 if ARCH_WRS default 2 if ARCH_WRS
default 1 default 1
help help
...@@ -334,7 +334,7 @@ config CODEOPT_SINGLE_INSTANCE_PER_PORT ...@@ -334,7 +334,7 @@ config CODEOPT_SINGLE_INSTANCE_PER_PORT
config CODEOPT_WRPC_SIZE config CODEOPT_WRPC_SIZE
boolean "Size optimizations specific for WRPC" boolean "Size optimizations specific for WRPC"
depends on CODEOPT_ENABLED && ARCH_WRPC depends on CODEOPT_ENABLED && ARCH_IS_WRPC=1
default y default y
help help
Use optimizations specific to WRPC to reduce the footprint. Use optimizations specific to WRPC to reduce the footprint.
...@@ -342,7 +342,7 @@ config CODEOPT_WRPC_SIZE ...@@ -342,7 +342,7 @@ config CODEOPT_WRPC_SIZE
config CODEOPT_EXT_PORT_CONF_FORCE_DISABLED config CODEOPT_EXT_PORT_CONF_FORCE_DISABLED
boolean "Remove external port configuration" boolean "Remove external port configuration"
depends on CODEOPT_ENABLED depends on CODEOPT_ENABLED
default y if ARCH_WRPC default y if ARCH_IS_WRPC=1
default n default n
help help
externalPortConfiguration set to false to reduce the footprint. externalPortConfiguration set to false to reduce the footprint.
...@@ -351,7 +351,7 @@ config CODEOPT_EXT_PORT_CONF_FORCE_DISABLED ...@@ -351,7 +351,7 @@ config CODEOPT_EXT_PORT_CONF_FORCE_DISABLED
config CODEOPT_SO_FORCE_DISABLED config CODEOPT_SO_FORCE_DISABLED
boolean "Force disabled slaveOnly" boolean "Force disabled slaveOnly"
depends on CODEOPT_ENABLED depends on CODEOPT_ENABLED
default y if ARCH_WRPC default y if ARCH_IS_WRPC=1
default n default n
help help
Force slaveOnly to false to reduce the footprint. Force slaveOnly to false to reduce the footprint.
...@@ -360,7 +360,7 @@ config CODEOPT_SO_FORCE_DISABLED ...@@ -360,7 +360,7 @@ config CODEOPT_SO_FORCE_DISABLED
config CODEOPT_MO_FORCE_DISABLED config CODEOPT_MO_FORCE_DISABLED
boolean "Force disabled masterOnly" boolean "Force disabled masterOnly"
depends on CODEOPT_ENABLED depends on CODEOPT_ENABLED
default y if ARCH_WRPC default y if ARCH_IS_WRPC=1
default n default n
help help
Force masterOnly to false to reduce the footprint. Force masterOnly to false to reduce the footprint.
...@@ -421,9 +421,9 @@ endchoice ...@@ -421,9 +421,9 @@ endchoice
config OPTIMIZATION config OPTIMIZATION
string string
default "-Os -ggdb" if OPTIMIZATION_SIZE_SPEED && ARCH_WRPC default "-Os -ggdb" if OPTIMIZATION_SIZE_SPEED && ARCH_IS_WRPC=1
default "-Os -ggdb" if OPTIMIZATION_SIZE_SPEED default "-Os -ggdb" if OPTIMIZATION_SIZE_SPEED
default "-O2 -ggdb" if OPTIMIZATION_SPEED && ARCH_WRPC default "-O2 -ggdb" if OPTIMIZATION_SPEED && ARCH_IS_WRPC=1
default "-O2 -ggdb" if OPTIMIZATION_SPEED default "-O2 -ggdb" if OPTIMIZATION_SPEED
default "-Og -ggdb" if OPTIMIZATION_DEBUGGING default "-Og -ggdb" if OPTIMIZATION_DEBUGGING
default "-ggdb" if OPTIMIZATION_NONE_DEBUGGING default "-ggdb" if OPTIMIZATION_NONE_DEBUGGING
...@@ -526,7 +526,7 @@ config ARCH_IS_WRS ...@@ -526,7 +526,7 @@ config ARCH_IS_WRS
config ARCH_IS_WRPC config ARCH_IS_WRPC
int int
range 0 1 range 0 1
default 1 if ARCH_WRPC default 1 if ARCH_WRPC || WRPC_PPSI
default 0 default 0
config HAS_PPSI_ASSERT config HAS_PPSI_ASSERT
......
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