diff --git a/Kconfig b/Kconfig index 8735d494abf09b4fa7a3bba5db1d23e911a6c82e..e12a8e308d3d406304a5fdf08dee85ab36db7ce7 100644 --- a/Kconfig +++ b/Kconfig @@ -21,15 +21,6 @@ config PRINT_BUFSIZE int default 128 -config ASSERT - bool "Build assertion checks in the code" - default y - help - Build assertions in the code, to catch unexpected situations. - When an assertion fails the code loops over repeating the - error message every second. OTOH, panic() is always built, - with no Kconfig -- and it does the same, unconditionally. - config RAMSIZE int default 65536 if WR_SWITCH @@ -92,8 +83,8 @@ config WR_NODE_PCS16 boolean "Compile for 16-bit PCS" default n help - This allows to compile the WR PTP Core software for 16-bit PCS platforms - (e.g. Kintex-7). + This allows to compile the WR PTP Core software for 16-bit PCS platforms + (e.g. Kintex-7). config STACKSIZE depends on WR_NODE @@ -160,23 +151,23 @@ config SYSLOG to enable it. The special "off" ipaddr disables syslog. config SNMP - depends on IP - default y - boolean "Mini SNMP responder" + depends on IP + default y + boolean "Mini SNMP responder" config SNMP_SET - depends on SNMP - default y - boolean "Add SET support to the Mini SNMP responder" - help + depends on SNMP + default y + boolean "Add SET support to the Mini SNMP responder" + help This option enables support for SET requests for Mini SNMP responder config SNMP_AUX_DIAG - depends on SNMP && AUX_DIAG - default y if AUX_DIAG - default n - boolean "Adds support of auxiliary diagnostics registers to SNMP" - help + depends on SNMP && AUX_DIAG + default y if AUX_DIAG + default n + boolean "Adds support of auxiliary diagnostics registers to SNMP" + help This option adds branch wrpcAuxDiag to the SNMP config SNMP_HW_TYPE @@ -210,17 +201,30 @@ config HAS_FLASH_INIT default 0 config FLASH_INIT - boolean - default y if EMBEDDED_NODE - default n + boolean + default y if EMBEDDED_NODE + default n config AUX_DIAG - default n - boolean "Add support for auxiliary diagnostics registers" - help + default n + boolean "Add support for auxiliary diagnostics registers" + help This option adds support for read/write of aux diag registers and the diag command. +config SDB_STORAGE + depends on WR_NODE + default y + boolean "Use SDB to manage storage (instead of legacy eeprom code)" + help + Use SDB to manage flash and eeproms (both W1 and I2C). If not, legacy code + (eeprom only) will be selected. + +config LEGACY_EEPROM + depends on WR_NODE + boolean + default !SDB_STORAGE + # # This is a set of configuration options that should not be changed by # normal users. If the "developer" menu is used, the binary is tainted. @@ -360,28 +364,15 @@ config PRINTF_IS_NONE but not suited for wrpc-sw. See pp_printf/README for details. endchoice -config PRINTF_XINT - boolean - default PRINTF_IS_XINT if (DEVELOPER && WR_NODE) +config ASSERT_ENA + bool "Build assertion checks in the code" + depends on DEVELOPER 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 - depends on WR_NODE - boolean help - Select this option for the ppsi engine (now only option) + Build assertions in the code, to catch unexpected situations. + When an assertion fails the code loops over repeating the + error message every second. OTOH, panic() is always built, + with no Kconfig -- and it does the same, unconditionally. config DETERMINISTIC_BINARY depends on DEVELOPER && EMBEDDED_NODE @@ -475,18 +466,6 @@ config VLAN_FOR_CLASS6 depends on VLAN int "Route this VLAN too to fabric class 6 (Streamer/NIC)" -config SDB_STORAGE - depends on WR_NODE - default y - boolean "Use SDB to manage storage (instead of legacy eeprom code)" - help - Use SDB to manage flash and eeproms (both W1 and I2C). If not, legacy code - (eeprom only) will be selected. - -config LEGACY_EEPROM - depends on WR_NODE - boolean - default !SDB_STORAGE config LATENCY_PROBE depends on DEVELOPER @@ -533,3 +512,32 @@ config VLAN_ARRAY_SIZE default 1 # CONFIG_WR_NODE + +################# helper configuration items ############# +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 + depends on WR_NODE + boolean + help + Select this option for the ppsi engine (now only option) + +config ASSERT + bool + default n if DEVELOPER && !ASSERT_ENA + default y diff --git a/configs/devel_build_test_defconfig b/configs/devel_build_test_defconfig index ec3635aaea0d80fa932f40cc8c4297114072065b..7ef38bdc843e1cbb8d01009bb956c384a07dcee3 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 d682ce7d93c01d74139ec36eed739317fa0a179e..e0684f7ed19948d6f300923bd2be811757ea4fdc 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 e16fa40a7fb1c231f90739a4893cd921f640dfda..c96879a62d37d55375277a1764be39c49dbdd4d3 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 8865a46b050e0e1fd074919eb25dab9013ff93a4..c96879a62d37d55375277a1764be39c49dbdd4d3 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 2250a25a10ce4a35004e1ffa02bf624476d1fd9c..2d9434cee260c5e4713b8e128ead96d9929bfd84 100644 --- a/configs/spec_defconfig +++ b/configs/spec_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 @@ -21,23 +22,30 @@ CONFIG_UART=y CONFIG_W1=y CONFIG_LATENCY_ETHTYPE=291 # CONFIG_P2P is not set -# CONFIG_IP is not set -# CONFIG_CMD_CONFIG is not set +CONFIG_IP=y +CONFIG_CMD_CONFIG=y +# CONFIG_SYSLOG is not set +CONFIG_SNMP=y +CONFIG_SNMP_SET=y +CONFIG_SNMP_AUX_DIAG=y +CONFIG_SNMP_HW_TYPE="spec" # CONFIG_BUILD_INIT is not set CONFIG_INIT_COMMAND="" CONFIG_HAS_BUILD_INIT=0 CONFIG_HAS_FLASH_INIT=1 CONFIG_FLASH_INIT=y -# CONFIG_AUX_DIAG is not set +CONFIG_AUX_DIAG=y +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/spec_pdelay_defconfig b/configs/spec_pdelay_defconfig index 14713b09777a2a31b77d020e9250f9b271720a0a..7f989cf0f88cd347e54c30c1af47e84dd05d20d5 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/spec_snmp_defconfig b/configs/spec_snmp_defconfig deleted file mode 100644 index 7c14056dd9b17fe7e8ff52d0c354432db3b22568..0000000000000000000000000000000000000000 --- a/configs/spec_snmp_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -# -# 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_VLAN_NR=0 -CONFIG_VLAN_1_FOR_CLASS7=0 -CONFIG_VLAN_2_FOR_CLASS7=0 -CONFIG_VLAN_FOR_CLASS6=0 -# 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_UART=y -CONFIG_W1=y -CONFIG_LATENCY_ETHTYPE=291 -# CONFIG_P2P is not set -CONFIG_IP=y -# CONFIG_CMD_CONFIG is not set -# CONFIG_SYSLOG is not set -CONFIG_SNMP=y -# CONFIG_SNMP_SET is not set -CONFIG_SNMP_AUX_DIAG=y -CONFIG_SNMP_HW_TYPE="spec" -# CONFIG_BUILD_INIT is not set -CONFIG_INIT_COMMAND="" -CONFIG_HAS_BUILD_INIT=0 -CONFIG_HAS_FLASH_INIT=1 -CONFIG_FLASH_INIT=y -CONFIG_AUX_DIAG=y - -# -# wrpc-sw is tainted if you change the following options -# -# CONFIG_DEVELOPER 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_SDB_STORAGE=y -# CONFIG_LEGACY_EEPROM is not set -# CONFIG_WR_NODE_SIM is not set -CONFIG_VLAN_ARRAY_SIZE=1 diff --git a/configs/spec_snmp_set_verbose_defconfig b/configs/spec_snmp_set_verbose_defconfig deleted file mode 100644 index 6c2e8e0bd67695119b2585506808662816632873..0000000000000000000000000000000000000000 --- a/configs/spec_snmp_set_verbose_defconfig +++ /dev/null @@ -1,67 +0,0 @@ -# -# 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_PLL_VERBOSE is not set -# CONFIG_PFILTER_VERBOSE is not set -# 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 is not set -CONFIG_LM32=y -CONFIG_EMBEDDED_NODE=y -# CONFIG_WR_NODE_PCS16 is not set -CONFIG_STACKSIZE=2048 -CONFIG_PPSI=y -CONFIG_UART=y -CONFIG_W1=y -CONFIG_LATENCY_ETHTYPE=291 -# CONFIG_P2P 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_AUX_DIAG=y -CONFIG_SNMP_HW_TYPE="spec" -# CONFIG_BUILD_INIT is not set -CONFIG_INIT_COMMAND="" -CONFIG_HAS_BUILD_INIT=0 -CONFIG_HAS_FLASH_INIT=1 -CONFIG_FLASH_INIT=y -CONFIG_AUX_DIAG=y - -# -# wrpc-sw is tainted if you change the following options -# -CONFIG_DEVELOPER=y -# CONFIG_CMD_LL is not set -# CONFIG_CHECK_RESET is not set -# 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_PRINTF_XINT=y -# CONFIG_PRINTF_FULL is not set -# CONFIG_PRINTF_MINI is not set -# CONFIG_PRINTF_NONE is not set -# CONFIG_DETERMINISTIC_BINARY is not set -# CONFIG_UART_SW is not set -# CONFIG_NET_VERBOSE is not set -CONFIG_SNMP_VERBOSE=y -CONFIG_FAKE_TEMPERATURES=y -CONFIG_SDB_STORAGE=y -# CONFIG_LEGACY_EEPROM is not set -# CONFIG_LATENCY_PROBE is not set -# CONFIG_WR_NODE_SIM is not set -CONFIG_VLAN_ARRAY_SIZE=1 diff --git a/configs/wr_switch_defconfig b/configs/wr_switch_defconfig index af929c691a0a5ca6f8940581405d924292bb34c7..7cc9a18c70936202b6fe7f64e9062ff3e756331b 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 e7f680214b1722d3c2afeb0c5358c3e7bc98b3d1..c6b0d24286e0f8483686284a9454469e6c8960fd 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 e1e3245aad64528db35e57a6c2a23f7e1141c210..0c1bd83495c7068ddb4008a73eaa1908ae91e111 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 diff --git a/ppsi b/ppsi index a563ada973ffd5480e13caf906377ecca49bdfc7..d9e59febd299d07f9ffcc59727311560b20078e5 160000 --- a/ppsi +++ b/ppsi @@ -1 +1 @@ -Subproject commit a563ada973ffd5480e13caf906377ecca49bdfc7 +Subproject commit d9e59febd299d07f9ffcc59727311560b20078e5