Fixed merge issue, added km3clbv spec

66f375fb · Vincent van Beveren · ecaae30f · 66f375fb · 66f375fb
Commit 66f375fb authored Mar 18, 2020 by Vincent van Beveren
Hide whitespace changes
Inline Side-by-side

Showing with 58 additions and 11 deletions

spec_km3clbv2 configs/spec_km3clbv2 +58 -0

wrc_main.c wrc_main.c +0 -11

No files found.
--- a/configs/spec_km3clbv2
+++ b/configs/spec_km3clbv2
+#
+# Automatically generated file; DO NOT EDIT.
+# WR PTP Core software configuration
+#
+# CONFIG_WR_SWITCH is not set
+CONFIG_WR_NODE=y
+CONFIG_PPSI_FORCE_CONFIG=y
+CONFIG_PRINT_BUFSIZE=128
+CONFIG_RAMSIZE=131072
+CONFIG_TEMP_POLL_INTERVAL=15
+CONFIG_TEMP_HIGH_THRESHOLD=70
+CONFIG_TEMP_HIGH_RAPPEL=60
+CONFIG_VLAN=y
+CONFIG_VLAN_NR=1
+CONFIG_VLAN_1_FOR_CLASS7=10
+CONFIG_VLAN_2_FOR_CLASS7=11
+CONFIG_VLAN_FOR_CLASS6=20
+# CONFIG_HOST_PROCESS is not set
+CONFIG_LM32=y
+CONFIG_EMBEDDED_NODE=y
+# CONFIG_WR_NODE_PCS16 is not set
+CONFIG_STACKSIZE=2048
+CONFIG_PPSI=y
+CONFIG_W1=y
+CONFIG_LATENCY_ETHTYPE=291
+# CONFIG_P2P is not set
+# CONFIG_WR_NIC_CPU is not set
+CONFIG_IP=y
+# CONFIG_CMD_CONFIG is not set
+# CONFIG_SYSLOG is not set
+CONFIG_SNMP=y
+CONFIG_SNMP_SET=y
+CONFIG_SNMP_INIT=y
+CONFIG_SNMP_SDB=y
+CONFIG_SNMP_AUX_DIAG=y
+CONFIG_BUILD_INIT=y
+CONFIG_INIT_COMMAND="vlan off;ptp stop;sfp match;mode slave;ptp start"
+CONFIG_HAS_BUILD_INIT=1
+CONFIG_HAS_FLASH_INIT=1
+CONFIG_FLASH_INIT=y
+CONFIG_AUX_DIAG=y
+CONFIG_SDB_STORAGE=y
+CONFIG_GENSDBFS=y
+# CONFIG_LEGACY_EEPROM is not set
+CONFIG_WR_DIAG=y
+# CONFIG_WR_NODE_SIM is not set
+CONFIG_ABSCAL=y
+CONFIG_LLDP=y
+
+#
+# wrpc-sw is tainted if you change the following options
+#
+# CONFIG_DEVELOPER is not set
+CONFIG_VLAN_ARRAY_SIZE=1
+CONFIG_PRINTF_XINT=y
+# CONFIG_PRINTF_FULL is not set
+# CONFIG_PRINTF_MINI is not set
+# CONFIG_PRINTF_NONE is not set
--- a/wrc_main.c
+++ b/wrc_main.c
@@ -240,17 +240,6 @@ DEFINE_WRC_TASK(wrx_Execute) = {
 	.job = wrx_Execute,
 };

-void wrx_Execute()
-{
-  wrxUpdate(link_status);
-  wrxExecute();
-}
-
-DEFINE_WRC_TASK(wrx_Execute) = {
-	.name = "wrx-exec",
-	.job = wrx_Execute,
-};
-
 static void task_time_normalize(struct wrc_task *t)
 {
 	if (t->nanos > 1000 * 1000 * 1000) {