Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
Software for White Rabbit PTP Core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
31
Issues
31
List
Board
Labels
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Software for White Rabbit PTP Core
Commits
30c50a31
Commit
30c50a31
authored
Mar 14, 2017
by
Adam Wujek
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Kconfig: move Vlans configuration outside developer
Signed-off-by:
Adam Wujek
<
adam.wujek@cern.ch
>
parent
490f32c9
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
22 deletions
+24
-22
Kconfig
Kconfig
+19
-21
spec_defconfig
configs/spec_defconfig
+1
-0
spec_pdelay_defconfig
configs/spec_pdelay_defconfig
+1
-0
wr_switch_defconfig
configs/wr_switch_defconfig
+1
-0
wrnic_defconfig
configs/wrnic_defconfig
+1
-0
wrpc.tex
doc/wrpc.tex
+1
-1
No files found.
Kconfig
View file @
30c50a31
...
@@ -225,6 +225,25 @@ config LEGACY_EEPROM
...
@@ -225,6 +225,25 @@ config LEGACY_EEPROM
boolean
boolean
default !SDB_STORAGE
default !SDB_STORAGE
config VLAN
boolean "Filter and rx/tx frames in a VLAN (as opposed to untagged)"
config VLAN_NR
depends on VLAN
int "Use this VLAN number for filter/tx/rx"
config VLAN_1_FOR_CLASS7
depends on VLAN
int "Route this VLAN to fabric class 7 (Etherbone)"
config VLAN_2_FOR_CLASS7
depends on VLAN
int "Route this VLAN too to fabric class 7 (Etherbone)"
config VLAN_FOR_CLASS6
depends on VLAN
int "Route this VLAN too to fabric class 6 (Streamer/NIC)"
config WR_NODE_SIM
config WR_NODE_SIM
depends on WR_NODE
depends on WR_NODE
boolean "Build simple software for test of WR PTP Core in simulation"
boolean "Build simple software for test of WR PTP Core in simulation"
...
@@ -458,27 +477,6 @@ config FAKE_TEMPERATURES
...
@@ -458,27 +477,6 @@ config FAKE_TEMPERATURES
The option adds also a "faketemp" command, used to set
The option adds also a "faketemp" command, used to set
the fake temperatures: e.g. "faketemp 120 -10 50"
the fake temperatures: e.g. "faketemp 120 -10 50"
config VLAN
depends on DEVELOPER
boolean "Filter and rx/tx frames in a VLAN (as opposed to untagged)"
config VLAN_NR
depends on VLAN
int "Use this VLAN number for filter/tx/rx"
config VLAN_1_FOR_CLASS7
depends on VLAN
int "Route this VLAN to fabric class 7 (Etherbone)"
config VLAN_2_FOR_CLASS7
depends on VLAN
int "Route this VLAN too to fabric class 7 (Etherbone)"
config VLAN_FOR_CLASS6
depends on VLAN
int "Route this VLAN too to fabric class 6 (Streamer/NIC)"
config LATENCY_PROBE
config LATENCY_PROBE
depends on DEVELOPER
depends on DEVELOPER
bool "Build the latency probe mechanism (send/recv)"
bool "Build the latency probe mechanism (send/recv)"
...
...
configs/spec_defconfig
View file @
30c50a31
...
@@ -8,6 +8,7 @@ CONFIG_PPSI_FORCE_CONFIG=y
...
@@ -8,6 +8,7 @@ CONFIG_PPSI_FORCE_CONFIG=y
CONFIG_PRINT_BUFSIZE=128
CONFIG_PRINT_BUFSIZE=128
CONFIG_RAMSIZE=131072
CONFIG_RAMSIZE=131072
CONFIG_TEMP_POLL_INTERVAL=15
CONFIG_TEMP_POLL_INTERVAL=15
# CONFIG_VLAN is not set
CONFIG_VLAN_NR=0
CONFIG_VLAN_NR=0
CONFIG_VLAN_1_FOR_CLASS7=0
CONFIG_VLAN_1_FOR_CLASS7=0
CONFIG_VLAN_2_FOR_CLASS7=0
CONFIG_VLAN_2_FOR_CLASS7=0
...
...
configs/spec_pdelay_defconfig
View file @
30c50a31
...
@@ -8,6 +8,7 @@ CONFIG_PPSI_FORCE_CONFIG=y
...
@@ -8,6 +8,7 @@ CONFIG_PPSI_FORCE_CONFIG=y
CONFIG_PRINT_BUFSIZE=128
CONFIG_PRINT_BUFSIZE=128
CONFIG_RAMSIZE=131072
CONFIG_RAMSIZE=131072
CONFIG_TEMP_POLL_INTERVAL=15
CONFIG_TEMP_POLL_INTERVAL=15
# CONFIG_VLAN is not set
CONFIG_VLAN_NR=0
CONFIG_VLAN_NR=0
CONFIG_VLAN_1_FOR_CLASS7=0
CONFIG_VLAN_1_FOR_CLASS7=0
CONFIG_VLAN_2_FOR_CLASS7=0
CONFIG_VLAN_2_FOR_CLASS7=0
...
...
configs/wr_switch_defconfig
View file @
30c50a31
...
@@ -10,6 +10,7 @@ CONFIG_RAMSIZE=65536
...
@@ -10,6 +10,7 @@ CONFIG_RAMSIZE=65536
CONFIG_TEMP_POLL_INTERVAL=15
CONFIG_TEMP_POLL_INTERVAL=15
CONFIG_PLL_VERBOSE=y
CONFIG_PLL_VERBOSE=y
CONFIG_WRC_VERBOSE=y
CONFIG_WRC_VERBOSE=y
# CONFIG_VLAN is not set
CONFIG_VLAN_NR=0
CONFIG_VLAN_NR=0
CONFIG_VLAN_1_FOR_CLASS7=0
CONFIG_VLAN_1_FOR_CLASS7=0
CONFIG_VLAN_2_FOR_CLASS7=0
CONFIG_VLAN_2_FOR_CLASS7=0
...
...
configs/wrnic_defconfig
View file @
30c50a31
...
@@ -8,6 +8,7 @@ CONFIG_PPSI_FORCE_CONFIG=y
...
@@ -8,6 +8,7 @@ CONFIG_PPSI_FORCE_CONFIG=y
CONFIG_PRINT_BUFSIZE=128
CONFIG_PRINT_BUFSIZE=128
CONFIG_RAMSIZE=131072
CONFIG_RAMSIZE=131072
CONFIG_TEMP_POLL_INTERVAL=15
CONFIG_TEMP_POLL_INTERVAL=15
# CONFIG_VLAN is not set
CONFIG_VLAN_NR=0
CONFIG_VLAN_NR=0
CONFIG_VLAN_1_FOR_CLASS7=0
CONFIG_VLAN_1_FOR_CLASS7=0
CONFIG_VLAN_2_FOR_CLASS7=0
CONFIG_VLAN_2_FOR_CLASS7=0
...
...
doc/wrpc.tex
View file @
30c50a31
...
@@ -1313,7 +1313,7 @@ udp-based network services, in addition to \textit{ptp}:
...
@@ -1313,7 +1313,7 @@ udp-based network services, in addition to \textit{ptp}:
\label
{
VLAN Support
}
\label
{
VLAN Support
}
The White Rabbit node can be configured to be vlan-aware, by setting
The White Rabbit node can be configured to be vlan-aware, by setting
\texttt
{
CONFIG
\_
VLAN
}
in
\textit
{
Kconfig
}
. The setting
depends on
\texttt
{
CONFIG
\_
DEVELOPER
}
.
\texttt
{
CONFIG
\_
VLAN
}
in
\textit
{
Kconfig
}
. The setting
is disabled by default
.
If configured for
\textit
{
vlan
}
support, the node selects packet-filter rules
If configured for
\textit
{
vlan
}
support, the node selects packet-filter rules
to receive frames in several
\textit
{
vlan
}
s, all set at configuration time.
to receive frames in several
\textit
{
vlan
}
s, all set at configuration time.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment