diff --git a/Kconfig b/Kconfig
index a33589bb3b7d24cff0742e27d9d968b0e19b408a..344a7d5d52b6273c5f04fd94371fd4bb5f0d36bd 100644
--- a/Kconfig
+++ b/Kconfig
@@ -12,14 +12,14 @@ config STACKSIZE
 	default 2048
 
 config PRINT_BUFSIZE
-       int
-       default 128
+	int
+	default 128
 
 config PRINTF_XINT
 	boolean
 	default y
 
-config PTP_NOPOSIX
+config PPSI
 	boolean
 	default y
 
@@ -28,8 +28,8 @@ config UART
 	default y
 
 config W1
-       boolean
-       default y
+	boolean
+	default y
 
 # The other ones can be set by non-developers
 
@@ -140,17 +140,16 @@ choice
 	prompt "Choose your preferred ptp engine"
 	depends on DEVELOPER
 
+config PPSI
+	boolean "ppsi"
+	help
+	  Select this option for the ppsi engine
+
 config PTP_NOPOSIX
 	boolean "ptp-noposix"
 	help
 	  Select this option for the ptp-noposix engine
 
-config PPSI
-	boolean "ppsi"
-	help
-	  Select this option for the ppsi engine. Warning: this option is
-	  work in progress, may not work or not compile at all.
-
 endchoice
 
 config DETERMINISTIC_BINARY
diff --git a/configs/etherbone_defconfig b/configs/etherbone_defconfig
index ae904cc22d841e948edebb5d50e0eb580ea883ed..50377b330082d24f5e125911cc9a3b649bffdbf6 100644
--- a/configs/etherbone_defconfig
+++ b/configs/etherbone_defconfig
@@ -5,7 +5,7 @@ CONFIG_RAMSIZE=90112
 CONFIG_STACKSIZE=2048
 CONFIG_PRINT_BUFSIZE=128
 CONFIG_PRINTF_XINT=y
-CONFIG_PTP_NOPOSIX=y
+CONFIG_PPSI=y
 CONFIG_UART=y
 CONFIG_W1=y
 CONFIG_ETHERBONE=y
diff --git a/configs/gsi_defconfig b/configs/gsi_defconfig
index e19f2ed1f675bb44e571133cb394789fd2349f63..8828698c4acef0570d44f101be0806dd0ba6ccb7 100644
--- a/configs/gsi_defconfig
+++ b/configs/gsi_defconfig
@@ -5,7 +5,7 @@ CONFIG_RAMSIZE=131072
 CONFIG_STACKSIZE=10240
 CONFIG_PRINT_BUFSIZE=128
 CONFIG_PRINTF_XINT=y
-# CONFIG_PTP_NOPOSIX is not set
+CONFIG_PPSI=y
 CONFIG_UART=y
 CONFIG_W1=y
 CONFIG_ETHERBONE=y
@@ -19,7 +19,7 @@ CONFIG_DEVELOPER=y
 # CONFIG_PRINTF_FULL is not set
 # CONFIG_PRINTF_MINI is not set
 # CONFIG_PRINTF_NONE is not set
-CONFIG_PPSI=y
+# CONFIG_PTP_NOPOSIX is not set
 # CONFIG_DETERMINISTIC_BINARY is not set
 # CONFIG_UART_SW is not set
 CONFIG_SDB_EEPROM=y
diff --git a/configs/ppsi_defconfig b/configs/ppsi_defconfig
index 2a62da55247d7af87c9d4cb06cf693738bc9ce22..f2bdf3ce6d84a572ae67627033c193430b308d6c 100644
--- a/configs/ppsi_defconfig
+++ b/configs/ppsi_defconfig
@@ -5,7 +5,7 @@ CONFIG_RAMSIZE=90112
 CONFIG_STACKSIZE=2048
 CONFIG_PRINT_BUFSIZE=128
 CONFIG_PRINTF_XINT=y
-# CONFIG_PTP_NOPOSIX is not set
+CONFIG_PPSI=y
 CONFIG_UART=y
 CONFIG_W1=y
 # CONFIG_ETHERBONE is not set
@@ -19,7 +19,7 @@ CONFIG_DEVELOPER=y
 # CONFIG_PRINTF_FULL is not set
 # CONFIG_PRINTF_MINI is not set
 # CONFIG_PRINTF_NONE is not set
-CONFIG_PPSI=y
+# CONFIG_PTP_NOPOSIX is not set
 # CONFIG_DETERMINISTIC_BINARY is not set
 # CONFIG_UART_SW is not set
 # CONFIG_SDB_EEPROM is not set
diff --git a/configs/ppsi_log_defconfig b/configs/ppsi_log_defconfig
index 0175bbe566b1cb0e616bf9b2d52bae74f42b3cfc..b30bca6b7d5a2058f9304fcb82264d94775b1fe2 100644
--- a/configs/ppsi_log_defconfig
+++ b/configs/ppsi_log_defconfig
@@ -5,7 +5,7 @@ CONFIG_RAMSIZE=90112
 CONFIG_STACKSIZE=2048
 CONFIG_PRINT_BUFSIZE=128
 CONFIG_PRINTF_XINT=y
-# CONFIG_PTP_NOPOSIX is not set
+CONFIG_PPSI=y
 CONFIG_UART=y
 CONFIG_W1=y
 # CONFIG_ETHERBONE is not set
@@ -19,7 +19,7 @@ CONFIG_DEVELOPER=y
 # CONFIG_PRINTF_FULL is not set
 # CONFIG_PRINTF_MINI is not set
 # CONFIG_PRINTF_NONE is not set
-CONFIG_PPSI=y
+# CONFIG_PTP_NOPOSIX is not set
 # CONFIG_DETERMINISTIC_BINARY is not set
 CONFIG_UART_SW=y
 # CONFIG_SDB_EEPROM is not set
diff --git a/configs/spec_defconfig b/configs/spec_defconfig
index fc7f0c1997dd379ac1e057fd2ad95e30317cfa16..5fca1c053962555a7665175026c74bcfd313efe3 100644
--- a/configs/spec_defconfig
+++ b/configs/spec_defconfig
@@ -5,7 +5,7 @@ CONFIG_RAMSIZE=90112
 CONFIG_STACKSIZE=2048
 CONFIG_PRINT_BUFSIZE=128
 CONFIG_PRINTF_XINT=y
-CONFIG_PTP_NOPOSIX=y
+CONFIG_PPSI=y
 CONFIG_UART=y
 CONFIG_W1=y
 # CONFIG_ETHERBONE is not set
diff --git a/configs/wrnic_defconfig b/configs/wrnic_defconfig
index fc7f0c1997dd379ac1e057fd2ad95e30317cfa16..5fca1c053962555a7665175026c74bcfd313efe3 100644
--- a/configs/wrnic_defconfig
+++ b/configs/wrnic_defconfig
@@ -5,7 +5,7 @@ CONFIG_RAMSIZE=90112
 CONFIG_STACKSIZE=2048
 CONFIG_PRINT_BUFSIZE=128
 CONFIG_PRINTF_XINT=y
-CONFIG_PTP_NOPOSIX=y
+CONFIG_PPSI=y
 CONFIG_UART=y
 CONFIG_W1=y
 # CONFIG_ETHERBONE is not set