Commit 9aee147d authored by Alessandro Rubini's avatar Alessandro Rubini

general: remove ptp-noposix

We are now strong with ppsi, remove any reference to ptp-noposix.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent af6367e6
......@@ -15,24 +15,9 @@ config BR2_CONFIGFILE
scripts print a warning and use the default file. Incorrect
files lead to unpredicatable results.
choice
prompt "PTP daemon implementation"
config PTP_NOPOSIX
bool "Use ptp-noposix daemon"
help
This implementation is being phased out, because it became
unmaintainable over time. However, it is still the default
at this point in time, because it has been tested and used
for a long time.
config PPSI
bool "Use PPSi daemon"
help
PPSi (PTP Ported to Silicon) is the new implementation, which
is already the default PTP run in the White Rabbit node.
endchoice
default y
menu "Local configuration"
......
......@@ -9,23 +9,14 @@ fi
wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR CROSS_COMPILE
# This step is controlled by Kconfig: skip it if not selected
if [ "x$CONFIG_PTP_NOPOSIX" != "x" ]; then
old_ptp=true; new_ptp=false
ptpname="ptp-noposix"
fi
if [ "x$CONFIG_PPSI" != "x" ]; then
old_ptp=false; new_ptp=true
ptpname="ppsi"
fi
wrs_echo "--- PTP daemon ($ptpname repository as a submodule)"
wrs_echo "--- PTP daemon (ppsi repository as a submodule)"
# checkout, in case the user didn't do that
cd ${WRS_BASE_DIR}/..
git submodule init -q
git submodule update -q
cd userspace/$ptpname
cd userspace/ppsi
make clean
# we need LINUX and CROSS_COMPILE. The latter is there for sure
......@@ -34,19 +25,8 @@ if [ "x$LINUX" == "x" ]; then
fi
if [ $ptpname = ppsi ]; then
make clean
make wrs_defconfig
make CROSS_COMPILE=$CROSS_COMPILE || wrs_die "Failure building PPSi"
install -d "$WRS_OUTPUT_DIR/images/wr/bin"
install ppsi "$WRS_OUTPUT_DIR/images/wr/bin"
else
make || wrs_die "Failure building $ptpname"
install -d "$WRS_OUTPUT_DIR/images/wr/bin"
install -d "$WRS_OUTPUT_DIR/images/wr/lib"
install -d "$WRS_OUTPUT_DIR/images/wr/include"
install ptpd "$WRS_OUTPUT_DIR/images/wr/bin"
install libptpnetif.a "$WRS_OUTPUT_DIR/images/wr/lib"
install libptpnetif/ptpd_netif.h "$WRS_OUTPUT_DIR/images/wr/include"
install libptpnetif/hal_client.h "$WRS_OUTPUT_DIR/images/wr/include"
fi
make clean
make wrs_defconfig
make CROSS_COMPILE=$CROSS_COMPILE || wrs_die "Failure building PPSi"
install -d "$WRS_OUTPUT_DIR/images/wr/bin"
install ppsi "$WRS_OUTPUT_DIR/images/wr/bin"
......@@ -2,7 +2,6 @@
# Automatically generated make config: don't edit
#
CONFIG_BR2_CONFIGFILE="wrs_release_br2_config"
# CONFIG_PTP_NOPOSIX is not set
CONFIG_PPSI=y
#
......
......@@ -755,16 +755,14 @@ Currently, the package includes the following modules:
@node PTPd
@subsection PTPd
Configuration supports two different PTP engines: either @t{ptp-noposix}
(default at this point in time) or PPSi. The latter is
the default choice, and will later be the only choice, as we phase
out the former implementation.
Configuration used to support two different PTP engines, but now
we only support PPSi.
Both implementations are hosted in their own respective different
repository; both are registered as @i{git} submodules in this package.
The repositories are hosted on @code{ohwr}, like others.
The code is hosted in its own
repository; it is a @i{git} submodules in this package.
The repository is hosted on @code{ohwr}, like others.
A plain @i{make} in either @i{userspace/ptp-noposix} or
A plain @i{make} in
@t{userspace/ppsi} will likely fail, because of
missing environment variables.
......
......@@ -161,14 +161,6 @@ The following configuration options are available
@t{configs/buildroot} directory; an absolute pathname is used
unchanged.
@c FIXME: remove noposix option
@item CONFIG_PTP_NOPOSIX
@itemx CONFIG_PPSI
Users can select one of these options, to build with one or the other
flavour of @sc{wr-ptp}. PPSi is the default choice, and
@i{ptp-noposix} is scheduled for removal in a later release.
@item CONFIG_NTP_SERVER
The NTP server used to prime White Rabbit time, at system boot.
......
......@@ -29,11 +29,6 @@ export WR_HOME="/wr"
eval $WR_HOME/bin/wrsw_hal -c $WR_HOME/etc/wrsw_hal.conf $LOGPIPE_HAL \&
eval $WR_HOME/bin/wrsw_rtud $LOGPIPE_RTU \&
# run ptp-noposix or ppsi, whatever is installed
if [ -x $WR_HOME/bin/ptpd ]; then
eval $WR_HOME/bin/ptpd -A -c $LOGPIPE_PTP \&
exit 0
fi
if [ ! -x $WR_HOME/bin/ppsi ]; then
echo "No WR-PTP daemon found" >&2
exit 1
......
......@@ -29,7 +29,6 @@ CFLAGS = -O2 -g -Wall \
-I../wrsw_rtud \
-I../mini-rpc \
-I../libsdb \
-I../ptp-noposix/PTPWRd \
-I../include
ifdef WRS_TOOLS_DEBUG
......
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