Skip to content

S
Software for White Rabbit PTP Core
Commit 586d21c8 authored by Adam Wujek's avatar Adam Wujek
1 Browse files
Options

Makefile: on *_defconfig concatenate ppsi's config if present 

When the make is called with <board>_defconfig parameter (e.g. mnake spec_defconfig)
use the config from configs/<board>_defconfig (e.g. configs/spec_defconfig) then
concatenate if present a config configs/<board>_defconfig from the ppsi repo
(e.g. ppsi/configs/spec_defconfig).
Signed-off-by: 's avatarAdam Wujek <adam.wujek@creotech.pl>
parent e4f4e5e4
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 10 deletions
.gitignore
View file @ 586d21c8
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
.tmp_* .tmp_*
.config .config
.config.old .config.old
configs/tmp_defconfig
include/config include/config
include/generated include/generated
size_db.txt size_db.txt
......
Makefile
View file @ 586d21c8
...@@ -262,9 +262,24 @@ silentoldconfig: ...@@ -262,9 +262,24 @@ silentoldconfig:
scripts_basic config: scripts_basic config:
$(MAKE) quiet=quiet_ -f Makefile.kconfig $@ $(MAKE) quiet=quiet_ -f Makefile.kconfig $@
%_defconfig:
# copy config from WRPC repo
@echo "Use configs/$@ as defconfig"
@cp configs/$@ configs/tmp_defconfig
# concatenate ppsi's config if present
@if [ -f ppsi/configs/$@ ]; then \
echo "Use ppsi/configs/$@ as defconfig for PPSI"; \
cat ppsi/configs/$@ >> configs/tmp_defconfig; \
else \
echo "ppsi/configs/$@ not found. Use default values for PPSI"; \
fi
$(MAKE) quiet=quiet_ -f Makefile.kconfig tmp_defconfig
rm configs/tmp_defconfig
%config: %config:
$(MAKE) quiet=quiet_ -f Makefile.kconfig $@ $(MAKE) quiet=quiet_ -f Makefile.kconfig $@
defconfig: defconfig:
$(MAKE) quiet=quiet_ -f Makefile.kconfig spec_defconfig $(MAKE) quiet=quiet_ -f Makefile.kconfig spec_defconfig
......
configs/spec_defconfig
View file @ 586d21c8
...@@ -2,11 +2,19 @@ ...@@ -2,11 +2,19 @@
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# WR PTP Core software configuration # WR PTP Core software configuration
# #
# CONFIG_WR_SWITCH is not set CONFIG_ARCH_LM32=y
# CONFIG_ARCH_RISCV is not set
CONFIG_TARGET_GENERIC_PHY_8BIT=y
# CONFIG_TARGET_GENERIC_PHY_16BIT is not set
# CONFIG_TARGET_WR_SWITCH is not set
# CONFIG_TARGET_AFCZ is not set
# CONFIG_TARGET_ERTM14 is not set
# CONFIG_TARGET_SIS8300KU is not set
# CONFIG_TARGET_PXIE_FMC is not set
CONFIG_WR_NODE=y CONFIG_WR_NODE=y
CONFIG_PPSI_FORCE_CONFIG=y CONFIG_STACKSIZE=2048
CONFIG_PRINT_BUFSIZE=128 CONFIG_PRINT_BUFSIZE=256
CONFIG_RAMSIZE=131072 CONFIG_RAMSIZE=196608
CONFIG_TEMP_POLL_INTERVAL=15 CONFIG_TEMP_POLL_INTERVAL=15
CONFIG_TEMP_HIGH_THRESHOLD=70 CONFIG_TEMP_HIGH_THRESHOLD=70
CONFIG_TEMP_HIGH_RAPPEL=60 CONFIG_TEMP_HIGH_RAPPEL=60
...@@ -16,19 +24,19 @@ CONFIG_VLAN_1_FOR_CLASS7=10 ...@@ -16,19 +24,19 @@ CONFIG_VLAN_1_FOR_CLASS7=10
CONFIG_VLAN_2_FOR_CLASS7=11 CONFIG_VLAN_2_FOR_CLASS7=11
CONFIG_VLAN_FOR_CLASS6=20 CONFIG_VLAN_FOR_CLASS6=20
# CONFIG_HOST_PROCESS is not set # CONFIG_HOST_PROCESS is not set
CONFIG_LM32=y
CONFIG_EMBEDDED_NODE=y CONFIG_EMBEDDED_NODE=y
# CONFIG_WR_NODE_PCS16 is not set CONFIG_WRPC_PPSI=y
CONFIG_STACKSIZE=2048
CONFIG_PPSI=y
CONFIG_W1=y CONFIG_W1=y
CONFIG_LATENCY_ETHTYPE=291 CONFIG_LATENCY_ETHTYPE=291
# CONFIG_P2P is not set
CONFIG_IP=y CONFIG_IP=y
# CONFIG_CMD_CONFIG is not set # CONFIG_CMD_CONFIG is not set
# CONFIG_SYSLOG is not set # CONFIG_SYSLOG is not set
# CONFIG_ETHERBONE is not set
CONFIG_SNMP=y CONFIG_SNMP=y
CONFIG_SNMP_SET=y CONFIG_SNMP_SET=y
CONFIG_SNMP_INIT=y
CONFIG_SNMP_SDB=y
CONFIG_SNMP_CMD=y
CONFIG_SNMP_AUX_DIAG=y CONFIG_SNMP_AUX_DIAG=y
CONFIG_BUILD_INIT=y CONFIG_BUILD_INIT=y
CONFIG_INIT_COMMAND="vlan off;ptp stop;sfp match;mode slave;ptp start" CONFIG_INIT_COMMAND="vlan off;ptp stop;sfp match;mode slave;ptp start"
...@@ -43,13 +51,24 @@ CONFIG_WR_DIAG=y ...@@ -43,13 +51,24 @@ CONFIG_WR_DIAG=y
# CONFIG_WR_NODE_SIM is not set # CONFIG_WR_NODE_SIM is not set
CONFIG_ABSCAL=y CONFIG_ABSCAL=y
CONFIG_LLDP=y CONFIG_LLDP=y
# CONFIG_CMD_PPS is not set
# CONFIG_CMD_LEAPSEC is not set
# CONFIG_NETCONSOLE is not set
# CONFIG_TRACE_MSGS is not set
CONFIG_TRACE_ALL=0
CONFIG_TRACE_MAIN=0
CONFIG_TRACE_STORAGE=0
CONFIG_TRACE_DEVICES=0
CONFIG_TRACE_BOARD=0
CONFIG_TRACE_MAC=0
CONFIG_TRACE_PHY=0
# #
# wrpc-sw is tainted if you change the following options # wrpc-sw is tainted if you change the following options
# #
# CONFIG_DEVELOPER is not set # CONFIG_DEVELOPER is not set
CONFIG_VLAN_ARRAY_SIZE=1
# CONFIG_PRINTF_XINT is not set # CONFIG_PRINTF_XINT is not set
CONFIG_PRINTF_FULL=y CONFIG_PRINTF_FULL=y
# CONFIG_PRINTF_MINI is not set # CONFIG_PRINTF_MINI is not set
# CONFIG_PRINTF_NONE is not set # CONFIG_PRINTF_NONE is not set
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