From 994f7ab4a0b740bae84182a4b922559a206432d3 Mon Sep 17 00:00:00 2001 From: Adam Wujek <adam.wujek@cern.ch> Date: Tue, 28 Feb 2017 17:35:03 +0100 Subject: [PATCH] configs: update configs This should make no techical changes. Signed-off-by: Adam Wujek <adam.wujek@cern.ch> --- configs/devel_build_test_defconfig | 17 ++++++---- configs/gsi_defconfig | 17 ++++++---- configs/gsi_pdelay_defconfig | 17 ++++++---- configs/host_process_config | 50 ++++++++++++++++++------------ configs/spec_defconfig | 1 + configs/spec_pdelay_defconfig | 9 ++++-- configs/wr_switch_defconfig | 4 ++- configs/wrnic_defconfig | 9 ++++-- configs/wrpc_sim_defconfig | 14 +++++---- 9 files changed, 87 insertions(+), 51 deletions(-) diff --git a/configs/devel_build_test_defconfig b/configs/devel_build_test_defconfig index ec3635aae..7ef38bdc8 100644 --- a/configs/devel_build_test_defconfig +++ b/configs/devel_build_test_defconfig @@ -4,6 +4,7 @@ # # 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 @@ -24,6 +25,7 @@ CONFIG_PPSI=y CONFIG_UART=y CONFIG_W1=y CONFIG_LATENCY_ETHTYPE=4455 +CONFIG_LATENCY_SYSLOG=y CONFIG_P2P=y CONFIG_IP=y CONFIG_CMD_CONFIG=y @@ -37,6 +39,8 @@ CONFIG_HAS_BUILD_INIT=1 CONFIG_HAS_FLASH_INIT=1 CONFIG_FLASH_INIT=y # CONFIG_AUX_DIAG is not set +CONFIG_SDB_STORAGE=y +# CONFIG_LEGACY_EEPROM is not set # # wrpc-sw is tainted if you change the following options @@ -51,16 +55,17 @@ CONFIG_PRINTF_IS_XINT=y # CONFIG_PRINTF_IS_FULL is not set # CONFIG_PRINTF_IS_MINI is not set # CONFIG_PRINTF_IS_NONE is not set -CONFIG_PRINTF_XINT=y -# CONFIG_PRINTF_FULL is not set -# CONFIG_PRINTF_MINI is not set -# CONFIG_PRINTF_NONE is not set +CONFIG_ASSERT_ENA=y CONFIG_DETERMINISTIC_BINARY=y CONFIG_UART_SW=y CONFIG_NET_VERBOSE=y # CONFIG_SNMP_VERBOSE is not set CONFIG_FAKE_TEMPERATURES=y -CONFIG_SDB_STORAGE=y -# CONFIG_LEGACY_EEPROM is not set CONFIG_LATENCY_PROBE=y +# CONFIG_WR_NODE_SIM 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 +CONFIG_ASSERT=y diff --git a/configs/gsi_defconfig b/configs/gsi_defconfig index d682ce7d9..e0684f7ed 100644 --- a/configs/gsi_defconfig +++ b/configs/gsi_defconfig @@ -4,6 +4,7 @@ # # 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 @@ -24,6 +25,7 @@ CONFIG_PPSI=y CONFIG_UART=y CONFIG_W1=y CONFIG_LATENCY_ETHTYPE=291 +CONFIG_LATENCY_SYSLOG=y # CONFIG_P2P is not set CONFIG_IP=y CONFIG_CMD_CONFIG=y @@ -35,6 +37,8 @@ CONFIG_HAS_BUILD_INIT=0 CONFIG_HAS_FLASH_INIT=1 CONFIG_FLASH_INIT=y # CONFIG_AUX_DIAG is not set +CONFIG_SDB_STORAGE=y +# CONFIG_LEGACY_EEPROM is not set # # wrpc-sw is tainted if you change the following options @@ -49,15 +53,16 @@ CONFIG_PRINTF_IS_XINT=y # CONFIG_PRINTF_IS_FULL is not set # CONFIG_PRINTF_IS_MINI is not set # CONFIG_PRINTF_IS_NONE is not set -CONFIG_PRINTF_XINT=y -# CONFIG_PRINTF_FULL is not set -# CONFIG_PRINTF_MINI is not set -# CONFIG_PRINTF_NONE is not set +CONFIG_ASSERT_ENA=y # CONFIG_DETERMINISTIC_BINARY is not set # CONFIG_UART_SW is not set # CONFIG_NET_VERBOSE is not set # CONFIG_FAKE_TEMPERATURES is not set -CONFIG_SDB_STORAGE=y -# CONFIG_LEGACY_EEPROM is not set CONFIG_LATENCY_PROBE=y +# CONFIG_WR_NODE_SIM 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 +CONFIG_ASSERT=y diff --git a/configs/gsi_pdelay_defconfig b/configs/gsi_pdelay_defconfig index e16fa40a7..c96879a62 100644 --- a/configs/gsi_pdelay_defconfig +++ b/configs/gsi_pdelay_defconfig @@ -4,6 +4,7 @@ # # 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 @@ -24,6 +25,7 @@ CONFIG_PPSI=y CONFIG_UART=y CONFIG_W1=y CONFIG_LATENCY_ETHTYPE=291 +CONFIG_LATENCY_SYSLOG=y CONFIG_P2P=y CONFIG_IP=y CONFIG_CMD_CONFIG=y @@ -35,6 +37,8 @@ CONFIG_HAS_BUILD_INIT=0 CONFIG_HAS_FLASH_INIT=1 CONFIG_FLASH_INIT=y # CONFIG_AUX_DIAG is not set +CONFIG_SDB_STORAGE=y +# CONFIG_LEGACY_EEPROM is not set # # wrpc-sw is tainted if you change the following options @@ -49,15 +53,16 @@ CONFIG_PRINTF_IS_XINT=y # CONFIG_PRINTF_IS_FULL is not set # CONFIG_PRINTF_IS_MINI is not set # CONFIG_PRINTF_IS_NONE is not set -CONFIG_PRINTF_XINT=y -# CONFIG_PRINTF_FULL is not set -# CONFIG_PRINTF_MINI is not set -# CONFIG_PRINTF_NONE is not set +CONFIG_ASSERT_ENA=y # CONFIG_DETERMINISTIC_BINARY is not set # CONFIG_UART_SW is not set # CONFIG_NET_VERBOSE is not set # CONFIG_FAKE_TEMPERATURES is not set -CONFIG_SDB_STORAGE=y -# CONFIG_LEGACY_EEPROM is not set CONFIG_LATENCY_PROBE=y +# CONFIG_WR_NODE_SIM 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 +CONFIG_ASSERT=y diff --git a/configs/host_process_config b/configs/host_process_config index 8865a46b0..c96879a62 100644 --- a/configs/host_process_config +++ b/configs/host_process_config @@ -4,55 +4,65 @@ # # 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_PLL_VERBOSE=y +# CONFIG_PLL_VERBOSE is not set # CONFIG_PFILTER_VERBOSE is not set -CONFIG_WRC_VERBOSE=y +# CONFIG_WRC_VERBOSE is not set # CONFIG_VLAN is not set CONFIG_VLAN_NR=0 CONFIG_VLAN_1_FOR_CLASS7=0 CONFIG_VLAN_2_FOR_CLASS7=0 CONFIG_VLAN_FOR_CLASS6=0 -CONFIG_HOST_PROCESS=y -# CONFIG_LM32 is not set -# CONFIG_EMBEDDED_NODE is not set +# CONFIG_HOST_PROCESS is not set +CONFIG_LM32=y +CONFIG_EMBEDDED_NODE=y # CONFIG_WR_NODE_PCS16 is not set -CONFIG_STACKSIZE=2048 +CONFIG_STACKSIZE=10240 CONFIG_PPSI=y -# CONFIG_UART is not set +CONFIG_UART=y +CONFIG_W1=y CONFIG_LATENCY_ETHTYPE=291 +CONFIG_LATENCY_SYSLOG=y CONFIG_P2P=y CONFIG_IP=y CONFIG_CMD_CONFIG=y -# CONFIG_SYSLOG is not set -CONFIG_SNMP=y -# CONFIG_SNMP_SET is not set -CONFIG_SNMP_HW_TYPE="spec" +CONFIG_SYSLOG=y +# CONFIG_SNMP is not set # CONFIG_BUILD_INIT is not set CONFIG_INIT_COMMAND="" CONFIG_HAS_BUILD_INIT=0 -CONFIG_HAS_FLASH_INIT=0 -# CONFIG_FLASH_INIT is not set +CONFIG_HAS_FLASH_INIT=1 +CONFIG_FLASH_INIT=y # CONFIG_AUX_DIAG is not set +CONFIG_SDB_STORAGE=y +# CONFIG_LEGACY_EEPROM is not set # # wrpc-sw is tainted if you change the following options # CONFIG_DEVELOPER=y +CONFIG_TEMP_HIGH_THRESHOLD=70 +CONFIG_TEMP_HIGH_RAPPEL=60 +CONFIG_CMD_LL=y +CONFIG_CHECK_RESET=y +# CONFIG_SPLL_FIFO_LOG is not set CONFIG_PRINTF_IS_XINT=y # CONFIG_PRINTF_IS_FULL is not set # CONFIG_PRINTF_IS_MINI is not set # CONFIG_PRINTF_IS_NONE is not set +CONFIG_ASSERT_ENA=y +# CONFIG_DETERMINISTIC_BINARY is not set +# CONFIG_UART_SW is not set +# CONFIG_NET_VERBOSE is not set +# CONFIG_FAKE_TEMPERATURES is not set +CONFIG_LATENCY_PROBE=y +# CONFIG_WR_NODE_SIM 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 -CONFIG_NET_VERBOSE=y -# CONFIG_SNMP_VERBOSE is not set -CONFIG_FAKE_TEMPERATURES=y -CONFIG_SDB_STORAGE=y -# CONFIG_LEGACY_EEPROM is not set -# CONFIG_LATENCY_PROBE is not set -CONFIG_VLAN_ARRAY_SIZE=1 +CONFIG_ASSERT=y diff --git a/configs/spec_defconfig b/configs/spec_defconfig index d6c803439..2d9434cee 100644 --- a/configs/spec_defconfig +++ b/configs/spec_defconfig @@ -48,3 +48,4 @@ CONFIG_PRINTF_XINT=y # CONFIG_PRINTF_FULL is not set # CONFIG_PRINTF_MINI is not set # CONFIG_PRINTF_NONE is not set +CONFIG_ASSERT=y diff --git a/configs/spec_pdelay_defconfig b/configs/spec_pdelay_defconfig index 14713b097..7f989cf0f 100644 --- a/configs/spec_pdelay_defconfig +++ b/configs/spec_pdelay_defconfig @@ -4,6 +4,7 @@ # # 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 @@ -29,15 +30,17 @@ CONFIG_HAS_BUILD_INIT=0 CONFIG_HAS_FLASH_INIT=1 CONFIG_FLASH_INIT=y # CONFIG_AUX_DIAG is not set +CONFIG_SDB_STORAGE=y +# CONFIG_LEGACY_EEPROM is not set # # wrpc-sw is tainted if you change the following options # # CONFIG_DEVELOPER is not set +# CONFIG_WR_NODE_SIM 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 -CONFIG_SDB_STORAGE=y -# CONFIG_LEGACY_EEPROM is not set -CONFIG_VLAN_ARRAY_SIZE=1 +CONFIG_ASSERT=y diff --git a/configs/wr_switch_defconfig b/configs/wr_switch_defconfig index af929c691..7cc9a18c7 100644 --- a/configs/wr_switch_defconfig +++ b/configs/wr_switch_defconfig @@ -4,6 +4,7 @@ # CONFIG_WR_SWITCH=y # CONFIG_WR_NODE is not set +CONFIG_PPSI_FORCE_CONFIG=y CONFIG_PRINT_BUFSIZE=128 CONFIG_RAMSIZE=65536 CONFIG_TEMP_POLL_INTERVAL=15 @@ -28,8 +29,9 @@ CONFIG_HAS_FLASH_INIT=0 # 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 -CONFIG_VLAN_ARRAY_SIZE=1 +CONFIG_ASSERT=y diff --git a/configs/wrnic_defconfig b/configs/wrnic_defconfig index e7f680214..c6b0d2428 100644 --- a/configs/wrnic_defconfig +++ b/configs/wrnic_defconfig @@ -4,6 +4,7 @@ # # 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 @@ -31,15 +32,17 @@ CONFIG_HAS_BUILD_INIT=0 CONFIG_HAS_FLASH_INIT=1 CONFIG_FLASH_INIT=y # CONFIG_AUX_DIAG is not set +CONFIG_SDB_STORAGE=y +# CONFIG_LEGACY_EEPROM is not set # # wrpc-sw is tainted if you change the following options # # CONFIG_DEVELOPER is not set +# CONFIG_WR_NODE_SIM 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 -CONFIG_SDB_STORAGE=y -# CONFIG_LEGACY_EEPROM is not set -CONFIG_VLAN_ARRAY_SIZE=1 +CONFIG_ASSERT=y diff --git a/configs/wrpc_sim_defconfig b/configs/wrpc_sim_defconfig index e1e3245aa..0c1bd8349 100644 --- a/configs/wrpc_sim_defconfig +++ b/configs/wrpc_sim_defconfig @@ -34,6 +34,8 @@ CONFIG_HAS_BUILD_INIT=0 CONFIG_HAS_FLASH_INIT=1 CONFIG_FLASH_INIT=y # CONFIG_AUX_DIAG is not set +CONFIG_SDB_STORAGE=y +# CONFIG_LEGACY_EEPROM is not set # # wrpc-sw is tainted if you change the following options @@ -46,16 +48,16 @@ CONFIG_PRINTF_IS_XINT=y # CONFIG_PRINTF_IS_FULL is not set # CONFIG_PRINTF_IS_MINI is not set # CONFIG_PRINTF_IS_NONE is not set -CONFIG_PRINTF_XINT=y -# CONFIG_PRINTF_FULL is not set -# CONFIG_PRINTF_MINI is not set -# CONFIG_PRINTF_NONE is not set +CONFIG_ASSERT_ENA=y # CONFIG_DETERMINISTIC_BINARY is not set # CONFIG_UART_SW is not set # CONFIG_NET_VERBOSE is not set # CONFIG_FAKE_TEMPERATURES is not set -CONFIG_SDB_STORAGE=y -# CONFIG_LEGACY_EEPROM is not set # CONFIG_LATENCY_PROBE is not set CONFIG_WR_NODE_SIM=y 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 +CONFIG_ASSERT=y -- GitLab