diff --git a/Kconfig_port_timing.in b/Kconfig_port_timing.in
index ff9f3e9416e30d5b2d078e5ec64e44b8512cd363..b322fa3222bbfb1e24f4f3fa70e1f1d27a73a9fe 100644
--- a/Kconfig_port_timing.in
+++ b/Kconfig_port_timing.in
@@ -1,6 +1,6 @@
 menu "Port Timing Configuration"
 config PTP_OPT_EXT_PORT_CONFIG_ENABLED
-	bool "externalPortConfigurationEnabled" 
+	bool "externalPortConfigurationEnabled"
 	default false
 	help
 	  This option is used by the high accuracy profile to force the port state.
@@ -8,8 +8,8 @@ config PTP_OPT_EXT_PORT_CONFIG_ENABLED
 	  For more details please refer to the IEEE 1588-2019 (clause 17.6.2)
 
 config PTP_SLAVE_ONLY
-	depends on PTP_OPT_EXT_PORT_CONFIG_ENABLED="n" 
-	bool "slaveOnly" 
+	depends on PTP_OPT_EXT_PORT_CONFIG_ENABLED="n"
+	bool "slaveOnly"
 	default n
 	help
 	  A slaveOnly Ordinary Clock utilizes the slaveOnly state machine
@@ -133,7 +133,7 @@ config PORT01_INST01_T24P_TRANS_POINT
 	 Defines the phase transition point for reception timestamps t2/t4 (ps)
 
 config PORT01_INST01_ANNOUNCE_INTERVAL
-	int "logAnnounceInterval" 
+	int "logAnnounceInterval"
 	default 1
 	range 0 4
 	help
@@ -304,7 +304,7 @@ config PORT02_INST01_T24P_TRANS_POINT
 	 Defines the phase transition point for reception timestamps t2/t4 (ps)
 
 config PORT02_INST01_ANNOUNCE_INTERVAL
-	int "logAnnounceInterval" 
+	int "logAnnounceInterval"
 	default 1
 	range 0 4
 	help
@@ -475,7 +475,7 @@ config PORT03_INST01_T24P_TRANS_POINT
 	 Defines the phase transition point for reception timestamps t2/t4 (ps)
 
 config PORT03_INST01_ANNOUNCE_INTERVAL
-	int "logAnnounceInterval" 
+	int "logAnnounceInterval"
 	default 1
 	range 0 4
 	help
@@ -646,7 +646,7 @@ config PORT04_INST01_T24P_TRANS_POINT
 	 Defines the phase transition point for reception timestamps t2/t4 (ps)
 
 config PORT04_INST01_ANNOUNCE_INTERVAL
-	int "logAnnounceInterval" 
+	int "logAnnounceInterval"
 	default 1
 	range 0 4
 	help
@@ -817,7 +817,7 @@ config PORT05_INST01_T24P_TRANS_POINT
 	 Defines the phase transition point for reception timestamps t2/t4 (ps)
 
 config PORT05_INST01_ANNOUNCE_INTERVAL
-	int "logAnnounceInterval" 
+	int "logAnnounceInterval"
 	default 1
 	range 0 4
 	help
@@ -988,7 +988,7 @@ config PORT06_INST01_T24P_TRANS_POINT
 	 Defines the phase transition point for reception timestamps t2/t4 (ps)
 
 config PORT06_INST01_ANNOUNCE_INTERVAL
-	int "logAnnounceInterval" 
+	int "logAnnounceInterval"
 	default 1
 	range 0 4
 	help
@@ -1159,7 +1159,7 @@ config PORT07_INST01_T24P_TRANS_POINT
 	 Defines the phase transition point for reception timestamps t2/t4 (ps)
 
 config PORT07_INST01_ANNOUNCE_INTERVAL
-	int "logAnnounceInterval" 
+	int "logAnnounceInterval"
 	default 1
 	range 0 4
 	help
@@ -1330,7 +1330,7 @@ config PORT08_INST01_T24P_TRANS_POINT
 	 Defines the phase transition point for reception timestamps t2/t4 (ps)
 
 config PORT08_INST01_ANNOUNCE_INTERVAL
-	int "logAnnounceInterval" 
+	int "logAnnounceInterval"
 	default 1
 	range 0 4
 	help
@@ -1501,7 +1501,7 @@ config PORT09_INST01_T24P_TRANS_POINT
 	 Defines the phase transition point for reception timestamps t2/t4 (ps)
 
 config PORT09_INST01_ANNOUNCE_INTERVAL
-	int "logAnnounceInterval" 
+	int "logAnnounceInterval"
 	default 1
 	range 0 4
 	help
@@ -1672,7 +1672,7 @@ config PORT10_INST01_T24P_TRANS_POINT
 	 Defines the phase transition point for reception timestamps t2/t4 (ps)
 
 config PORT10_INST01_ANNOUNCE_INTERVAL
-	int "logAnnounceInterval" 
+	int "logAnnounceInterval"
 	default 1
 	range 0 4
 	help
@@ -1843,7 +1843,7 @@ config PORT11_INST01_T24P_TRANS_POINT
 	 Defines the phase transition point for reception timestamps t2/t4 (ps)
 
 config PORT11_INST01_ANNOUNCE_INTERVAL
-	int "logAnnounceInterval" 
+	int "logAnnounceInterval"
 	default 1
 	range 0 4
 	help
@@ -2014,7 +2014,7 @@ config PORT12_INST01_T24P_TRANS_POINT
 	 Defines the phase transition point for reception timestamps t2/t4 (ps)
 
 config PORT12_INST01_ANNOUNCE_INTERVAL
-	int "logAnnounceInterval" 
+	int "logAnnounceInterval"
 	default 1
 	range 0 4
 	help
@@ -2185,7 +2185,7 @@ config PORT13_INST01_T24P_TRANS_POINT
 	 Defines the phase transition point for reception timestamps t2/t4 (ps)
 
 config PORT13_INST01_ANNOUNCE_INTERVAL
-	int "logAnnounceInterval" 
+	int "logAnnounceInterval"
 	default 1
 	range 0 4
 	help
@@ -2356,7 +2356,7 @@ config PORT14_INST01_T24P_TRANS_POINT
 	 Defines the phase transition point for reception timestamps t2/t4 (ps)
 
 config PORT14_INST01_ANNOUNCE_INTERVAL
-	int "logAnnounceInterval" 
+	int "logAnnounceInterval"
 	default 1
 	range 0 4
 	help
@@ -2527,7 +2527,7 @@ config PORT15_INST01_T24P_TRANS_POINT
 	 Defines the phase transition point for reception timestamps t2/t4 (ps)
 
 config PORT15_INST01_ANNOUNCE_INTERVAL
-	int "logAnnounceInterval" 
+	int "logAnnounceInterval"
 	default 1
 	range 0 4
 	help
@@ -2698,7 +2698,7 @@ config PORT16_INST01_T24P_TRANS_POINT
 	 Defines the phase transition point for reception timestamps t2/t4 (ps)
 
 config PORT16_INST01_ANNOUNCE_INTERVAL
-	int "logAnnounceInterval" 
+	int "logAnnounceInterval"
 	default 1
 	range 0 4
 	help
@@ -2869,7 +2869,7 @@ config PORT17_INST01_T24P_TRANS_POINT
 	 Defines the phase transition point for reception timestamps t2/t4 (ps)
 
 config PORT17_INST01_ANNOUNCE_INTERVAL
-	int "logAnnounceInterval" 
+	int "logAnnounceInterval"
 	default 1
 	range 0 4
 	help
@@ -3040,7 +3040,7 @@ config PORT18_INST01_T24P_TRANS_POINT
 	 Defines the phase transition point for reception timestamps t2/t4 (ps)
 
 config PORT18_INST01_ANNOUNCE_INTERVAL
-	int "logAnnounceInterval" 
+	int "logAnnounceInterval"
 	default 1
 	range 0 4
 	help
diff --git a/userspace/host_tools/gen_kconfig_port_timing.sh b/userspace/host_tools/gen_kconfig_port_timing.sh
index d093fd25d4bc045cb37bbe192539d18e6b4fe2a7..22be603c9c351aa376e08964b37d04fffaee2504 100755
--- a/userspace/host_tools/gen_kconfig_port_timing.sh
+++ b/userspace/host_tools/gen_kconfig_port_timing.sh
@@ -30,7 +30,7 @@ function print_header() {
 
 	echo -e "menu \"Port Timing Configuration\"" >$OUTPUT_FILE
 	echo -e "config PTP_OPT_EXT_PORT_CONFIG_ENABLED" >>$OUTPUT_FILE
-	echo -e "\tbool \"externalPortConfigurationEnabled\" " >>$OUTPUT_FILE
+	echo -e "\tbool \"externalPortConfigurationEnabled\"" >>$OUTPUT_FILE
 	echo -e "\tdefault false" >>$OUTPUT_FILE
 	echo -e "\thelp" >>$OUTPUT_FILE
 	echo -e "\t  This option is used by the high accuracy profile to force the port state." >>$OUTPUT_FILE  
@@ -38,8 +38,8 @@ function print_header() {
 	echo -e "\t  For more details please refer to the IEEE 1588-2019 (clause 17.6.2)" >>$OUTPUT_FILE
 
 	echo -e "\nconfig PTP_SLAVE_ONLY" >>$OUTPUT_FILE
-	echo -e "\tdepends on PTP_OPT_EXT_PORT_CONFIG_ENABLED=\"n\" " >>$OUTPUT_FILE
-	echo -e "\tbool \"slaveOnly\" " >>$OUTPUT_FILE
+	echo -e "\tdepends on PTP_OPT_EXT_PORT_CONFIG_ENABLED=\"n\"" >>$OUTPUT_FILE
+	echo -e "\tbool \"slaveOnly\"" >>$OUTPUT_FILE
 	echo -e "\tdefault n" >>$OUTPUT_FILE
 	echo -e "\thelp" >>$OUTPUT_FILE
 	echo -e "\t  A slaveOnly Ordinary Clock utilizes the slaveOnly state machine" >>$OUTPUT_FILE
@@ -198,7 +198,7 @@ function print_instance_header() {
 	echo -e "	 Defines the phase transition point for reception timestamps t2/t4 (ps)" >>$OUTPUT_FILE
 		
 	echo -e "\nconfig PORT${portStr}_INST${instStr}_ANNOUNCE_INTERVAL" >>$OUTPUT_FILE
-	echo -e "	int \"logAnnounceInterval\" " >>$OUTPUT_FILE
+	echo -e "	int \"logAnnounceInterval\"" >>$OUTPUT_FILE
 	echo -e "	default 1" >>$OUTPUT_FILE
 	echo -e "	range 0 4" >>$OUTPUT_FILE
 	echo -e "	help" >>$OUTPUT_FILE
@@ -260,7 +260,7 @@ function print_instance_header() {
 		echo -e "	  L1SyncEnabled is TRUE, then the L1Sync message exchange is supported and enabled" >>$OUTPUT_FILE
 	
 		echo -e "\nconfig PORT${portStr}_INST${instStr}_L1SYNC_INTERVAL" >>$OUTPUT_FILE
-		echo -e "	depends on PORT${portStr}_INST${instStr}_PROFILE_HA || (PORT${portStr}_INST${instStr}_PROFILE_CUSTOM &&  PORT${portStr}_INST${instStr}_L1SYNC_ENABLED=\"y\") " >>$OUTPUT_FILE
+		echo -e "	depends on PORT${portStr}_INST${instStr}_PROFILE_HA || (PORT${portStr}_INST${instStr}_PROFILE_CUSTOM && PORT${portStr}_INST${instStr}_L1SYNC_ENABLED=\"y\")" >>$OUTPUT_FILE
 		echo -e "	int \"L1SyncBasicPortDS.logL1SyncInterval\"" >>$OUTPUT_FILE
 		echo -e "	default 0" >>$OUTPUT_FILE
 		echo -e "	range -4 4" >>$OUTPUT_FILE
@@ -271,7 +271,7 @@ function print_instance_header() {
 		echo -e "	  The configurable range shall be -4 to 4" >>$OUTPUT_FILE
 			
 		echo -e "\nconfig PORT${portStr}_INST${instStr}_L1SYNC_RECEIPT_TIMEOUT" >>$OUTPUT_FILE
-		echo -e "	depends on PORT${portStr}_INST${instStr}_PROFILE_HA || (PORT${portStr}_INST${instStr}_PROFILE_CUSTOM &&  PORT${portStr}_INST${instStr}_L1SYNC_ENABLED=\"y\") " >>$OUTPUT_FILE
+		echo -e "	depends on PORT${portStr}_INST${instStr}_PROFILE_HA || (PORT${portStr}_INST${instStr}_PROFILE_CUSTOM && PORT${portStr}_INST${instStr}_L1SYNC_ENABLED=\"y\") " >>$OUTPUT_FILE
 		echo -e "	int \"L1SyncBasicPortDS.L1SyncReceiptTimeout\"" >>$OUTPUT_FILE
 		echo -e "	default 3" >>$OUTPUT_FILE
 		echo -e "	range 2 10" >>$OUTPUT_FILE
@@ -283,7 +283,7 @@ function print_instance_header() {
 		echo -e "	  The configurable range shall be 2 to 10" >>$OUTPUT_FILE
 		
 		echo -e "\nconfig PORT${portStr}_INST${instStr}_L1SYNC_TX_COHERENCY_IS_REQUIRED" >>$OUTPUT_FILE
-		echo -e "	depends on PORT${portStr}_INST${instStr}_PROFILE_CUSTOM &&  PORT${portStr}_INST${instStr}_L1SYNC_ENABLED=\"y\" " >>$OUTPUT_FILE
+		echo -e "	depends on PORT${portStr}_INST${instStr}_PROFILE_CUSTOM && PORT${portStr}_INST${instStr}_L1SYNC_ENABLED=\"y\"" >>$OUTPUT_FILE
 		echo -e "	bool \"L1SyncBasicPortDS.txCoherencyIsRequired\"" >>$OUTPUT_FILE
 		echo -e "	default y" >>$OUTPUT_FILE
 		echo -e "	help" >>$OUTPUT_FILE
@@ -292,7 +292,7 @@ function print_instance_header() {
 		echo -e "	   required to be a transmit coherent port." >>$OUTPUT_FILE
 	
 		echo -e "\nconfig PORT${portStr}_INST${instStr}_L1SYNC_RX_COHERENCY_IS_REQUIRED" >>$OUTPUT_FILE
-		echo -e "	depends on PORT${portStr}_INST${instStr}_PROFILE_CUSTOM &&  PORT${portStr}_INST${instStr}_L1SYNC_ENABLED=\"y\" " >>$OUTPUT_FILE
+		echo -e "	depends on PORT${portStr}_INST${instStr}_PROFILE_CUSTOM && PORT${portStr}_INST${instStr}_L1SYNC_ENABLED=\"y\"" >>$OUTPUT_FILE
 		echo -e "	bool \"L1SyncBasicPortDS.rxCoherencyIsRequired\"" >>$OUTPUT_FILE
 		echo -e "	default y" >>$OUTPUT_FILE
 		echo -e "	help" >>$OUTPUT_FILE
@@ -301,7 +301,7 @@ function print_instance_header() {
 		echo -e "	  required to be a receive coherent port." >>$OUTPUT_FILE
 	
 		echo -e "\nconfig PORT${portStr}_INST${instStr}_L1SYNC_CONGRUENCY_IS_REQUIRED" >>$OUTPUT_FILE
-		echo -e "	depends on PORT${portStr}_INST${instStr}_PROFILE_CUSTOM &&  PORT${portStr}_INST${instStr}_L1SYNC_ENABLED=\"y\" " >>$OUTPUT_FILE
+		echo -e "	depends on PORT${portStr}_INST${instStr}_PROFILE_CUSTOM && PORT${portStr}_INST${instStr}_L1SYNC_ENABLED=\"y\"" >>$OUTPUT_FILE
 		echo -e "	bool \"L1SyncBasicPortDS.congruencyIsRequired\"" >>$OUTPUT_FILE
 		echo -e "	default y" >>$OUTPUT_FILE
 		echo -e "	help" >>$OUTPUT_FILE
@@ -310,7 +310,7 @@ function print_instance_header() {
 		echo -e "	  be a congruent port" >>$OUTPUT_FILE
 	
 		echo -e "\nconfig PORT${portStr}_INST${instStr}_L1SYNC_OPT_PARAMS_ENABLED" >>$OUTPUT_FILE
-		echo -e "	depends on PORT${portStr}_INST${instStr}_PROFILE_CUSTOM &&  PORT${portStr}_INST${instStr}_L1SYNC_ENABLED=\"y\" " >>$OUTPUT_FILE
+		echo -e "	depends on PORT${portStr}_INST${instStr}_PROFILE_CUSTOM && PORT${portStr}_INST${instStr}_L1SYNC_ENABLED=\"y\"" >>$OUTPUT_FILE
 		echo -e "	bool \"L1SyncBasicPortDS.optParamsEnabled\"" >>$OUTPUT_FILE
 		echo -e "	default n" >>$OUTPUT_FILE
 		echo -e "	help" >>$OUTPUT_FILE
@@ -318,7 +318,7 @@ function print_instance_header() {
 		echo -e "	  TLV extends this TLV with the information about the optional parameters." >>$OUTPUT_FILE
 	
 		echo -e "\nconfig PORT${portStr}_INST${instStr}_L1SYNC_OPT_PARAMS_TS_CORRECTED_TX_ENABLED" >>$OUTPUT_FILE
-		echo -e "	depends on PORT${portStr}_INST${instStr}_L1SYNC_OPT_PARAMS_ENABLED=\"y\" " >>$OUTPUT_FILE
+		echo -e "	depends on PORT${portStr}_INST${instStr}_L1SYNC_OPT_PARAMS_ENABLED=\"y\"" >>$OUTPUT_FILE
 		echo -e "	bool \"L1SyncBasicPortDS.timestampsCorrectedTx\"" >>$OUTPUT_FILE
 		echo -e "	default n" >>$OUTPUT_FILE
 		echo -e "	help" >>$OUTPUT_FILE