Update 04.04.03-FW26

.gitattributes

@@ -1,3 +1,4 @@
-ptxproj/src/go1.18.7.linux-amd64.tar.gz filter=lfs diff=lfs merge=lfs -text
 ptxproj/src/linux-*.tgz filter=lfs diff=lfs merge=lfs -text
+ptxproj/src/linux-5.15.107-rt62-w04.02.02.tgz filter=lfs diff=lfs merge=lfs -text
 ptxproj/src/boost_1_68_0.tar.bz2 filter=lfs diff=lfs merge=lfs -text
+ptxproj/src/go1.18.7.linux-amd64.tar.gz filter=lfs diff=lfs merge=lfs -text

Changelog

@@ -1,3 +1,64 @@
+Firmware Release 04.04.03 (26) – CODESYS 3
+
+Engineering by CODESYS IDE V. 3.5 is supported
+Engineering by e!COCKPIT IDE is not supported
+CODESYS 2.3 is not supported
+
+Migration Guide – from e!COCKPIT to CODEYS V3.5:
+• https://techdocs.wago.com/Software/eCOCKPIT_Migration/en-US/index.html#index_content
+
+System:
+[FIXED] Sporadic failure of data communication to the cloud
+[FIXED] NTP client timeout too short. Increased to 8 sec.
+[FIXED] If the device is in separate mode and no web server is running, the fire wall 
+        blocks the webserver after armed, regardless of how the firewall is set
+[FIXED] APN configuration leads to modem reset
+[FIXED] FTP didn’t support NOOP command
+[FIXED] Ensure UTF-8 encoding for log files
+[DEPRECATED] The network feature rate limiting is deprecated and will be removed in fu-ture versions
+[Note]  ADVIDE Code generation from WDA OpenAPI is possible via Postman
+
+
+Operating System: 
+[FIXED] SECURITY CVE-2023-27533, CVE-2023-27534, CVE-2023-27535, CVE-2023-27536, CVE-2023-27537, CVE-2023-27538
+[CHANGED] Update rauc to v1.9
+
+Runtime System:
+[NEW]   CODESYS3 Runtime-System 3.5.19.20
+[NEW]   CODESYS Redundancy. Needs DRM license 2759-249/210-1000 or 2759-249/211-1000
+[FIXED] Data Sources Manager didn’t support Application V3
+[CHANGED] Access blocking for 1h after 5 login failures
+[CHANGED] Runtime file access is limited to /home/codesys, /media/sd, /tmp
+[CHANGED] The restriction to WAGO Ethernet Sub Devices has been removed for compatibility reasons
+[FIXED] SECURITY CVE-2022-4224, CVE-2022-47378, CVE-2022-47379, CVE-2022-47380, CVE-2022-47381, CVE-2022-47382,
+                 CVE-2022-47383, CVE-2022-47384, CVE-2022-47385, CVE-2022-47386, CVE-2022-47387, CVE-2022-47388,
+                 CVE-2022-47389, CVE-2022-47390, CVE-2022-47392, CVE-2022-47393, CVE-2022-47391, CVE-2023-37545,
+                 CVE-2023-37546, CVE-2023-37547, CVE-2023-37548, CVE-2023-37549, CVE-2023-37550, CVE-2023-37551,
+                 CVE-2023-37552, CVE-2023-37553, CVE-2023-37554, CVE-2023-37555, CVE-2023-37556, CVE-2023-37557,
+                 CVE-2023-37558, CVE-2023-37559, CODESYS IDE: CVE-2023-3662, CVE-2023-3663, CVE-2023-3669
+
+Fieldbus Interface & Protocols:
+[NEW]   Modbus RTU: CODESYS configurator for the onboard serial interface
+[NEW]   PROFINET: Limited support of CODESYS PROFINET controller and device
+[NOTE]  IMPORTANT PROFINET: no MRP ring redundancy, no LLDP support, no Daisy Chain wiring, limited to one Ethernet port
+[NOTE]  ADVICE  PROFINET: do not use the controller with more than 5 devices
+[FIXED] BACnet: Max/Min Pres Value Property in Analog Input Objects
+[FIXED] BACnet: Sporadic missing synchronicity between runtime and BACnet objects
+[FIXED] BACnet: Synchronization if an override configuration file exists with ob-jects that have more properties defined in the configuration file than in CODESYS
+[FIXED] BACnet: Non alphanumeric characters in Trendlog object name
+[FIXED] OPC UA Client: CmpOPCUAClient stops the runtime if the connected server is shut down.
+
+Libraries:
+[NEW]   WagoSysModem 2.0.1.0: Send SMS in text mode
+[NEW]   WagoSyCurl: Support for WSTRING
+[NEW]   WagoAppCloud: Support for data types SINT, LINT, ULINT and LWORD
+
+Web Based Management:
+[FIXED] Automatically redirect to application didn’t work if separate ports are enabled for WBM and WebVisu.
+[FIXED] SECURITY CVE-2023-3379, CVE-2023-3378
+
+################################################################################
+
 Firmware Release 04.03.03 (25) – CODESYS 3
 
 Engineering by CODESYS IDE V. 3.5 is supported

README.md

@@ -380,3 +380,7 @@ and consistency and do some unit testing in an automated way.**
 | 750-8217/025-000 | PFC200 G2 2ETH RS 4G EU T |
 | 750-8217/600-000 | PFC200 G2 2ETH RS 4G Global |
 | 750-8217/625-000 | PFC200 G2 2ETH RS 4G Global T |
+| 750-8110 | PFC100 G2 2ETH ECO |
+| 750-8111 | PFC100 G2 2ETH |
+| 750-8112 | PFC100 G2 2ETH RS |
+| 750-8112/025-000 | PFC100 G2 2ETH RS T |

ptxproj/Makefile

@@ -5,7 +5,7 @@
 #
 # This file is part of WAGO PFC BSP.
 #
-# Copyright (c) 2018-2022 WAGO GmbH & Co. KG
+# Copyright (c) 2018-2023 WAGO GmbH & Co. KG
 #
 # Contributors:
 #   PEn: WAGO GmbH & Co. KG
@@ -32,8 +32,9 @@ KERNEL_VERSION ?= $(shell echo $(PTXCONF_KERNEL_VERSION))
 PLATFORMDIR ?= platform-$(PLATFORM)
 TARGETROOT ?= $(shell ptxdist print ROOTDIR)
 PLATFORM_PROJECTROOT ?= projectroot.$(PLATFORM)
-BUILDSUPPORTDIR ?= shared_public/build
+BUILDSUPPORTDIR ?= scripts/wago
 XMLSTARLET ?= xmlstarlet
+PTXDIST_SYSROOT_HOST_PATH ?= $(shell ptxdist print HOST_PATH)
 
 #Firmware information
 FIRMWARE_REVISION_STRING := $(shell cat $(TARGETROOT)/etc/REVISIONS)
@@ -47,19 +48,13 @@ FIRMWARE_SVNREVISION := $(shell cat $(TARGETROOT)/etc/SVNREVISION | head -n1 | c
 
 # Map platform/project names to more user friendly target names
 ifeq ($(PLATFORM),wago-pfcXXX)
-ifdef PTXCONF_PFC_200_G2
 FIRMWARE_PLATFORM ?= PFC-G2-Linux
-else
-FIRMWARE_PLATFORM ?= PFC-Linux
-endif
 else ifeq ($(PLATFORM),wago-pfcXXX-hardened)
-ifdef PTXCONF_PFC_200_G2
 FIRMWARE_PLATFORM ?= PFC-G2-Linux-hardened
-else
-FIRMWARE_PLATFORM ?= PFC-Linux-hardened
-endif
 else ifeq ($(PLATFORM),vtp-ctp)
 FIRMWARE_PLATFORM ?= TP-Linux
+else ifeq ($(PLATFORM),wago-pfc300)
+FIRMWARE_PLATFORM ?= PFC-300-Linux
 else ifeq ($(PLATFORM),cc100)
 FIRMWARE_PLATFORM ?= CC100-Linux
 fsbl := stm32mp1-tf-a-stm32mp151-cc100.stm32
@@ -86,7 +81,7 @@ SD_IMAGE_ORIGINAL ?= $(PLATFORMDIR)/images/sd.hdimg
 WUP ?= $(OUT_DIR)/$(FIRMWARE_PLATFORM)_update_$(IMAGE_ID).wup
 WUP_CONTROLFILE ?= $(OUT_DIR)/package-info.xml
 WUP_CONTROLFILE_SCHEMA ?= $(BUILDSUPPORTDIR)/FWUPFC-Linux_1_0.xsd
-WUP_CONTROLFILE_GENERATOR ?= shared_public/build/create_wup_controlfile.sh
+WUP_CONTROLFILE_GENERATOR ?= $(BUILDSUPPORTDIR)/create_wup_controlfile.sh
 WUP_ATTACHMENTS +=
 WUP_FILES = $(WUP_CONTROLFILE)
 WUP_FILES += $(RAUC_UPDATEFILE)
@@ -120,6 +115,9 @@ GENIMAGE_CONFIGS := $(addprefix $(OUT_DIR)/,$(notdir $(wildcard $(IMAGE_DIR)/*.c
 ifeq ($(PLATFORM),$(filter $(PLATFORM),wago-pfcXXX wago-pfcXXX-hardened))
 PRODUCTION_IMAGES += $(OUT_DIR)/emmc-wago-production-pfc200v3_$(IMAGE_ID).img
 PRODUCTION_IMAGES += $(OUT_DIR)/emmc-commission-pfc200v3_$(IMAGE_ID).img
+
+PRODUCTION_IMAGES += $(OUT_DIR)/emmc-wago-production-pfc100g2_$(IMAGE_ID).img
+PRODUCTION_IMAGES += $(OUT_DIR)/emmc-commission-pfc100g2_$(IMAGE_ID).img
 endif
 
 PRODUCTION_IMAGES += $(OUT_DIR)/firmware_$(IMAGE_ID).hex
@@ -134,7 +132,7 @@ IMAGES_ARCHIVE += $(OUT_DIR)/images_$(IMAGE_ID).tar.gz
 ROOT_DEBUG_ARCHIVE += $(OUT_DIR)/root-debug_$(IMAGE_ID).tar.gz
 
 INDEX ?= $(OUT_DIR)/index.json
-INDEX_GENERATOR ?= shared_public/build/create_index.sh
+INDEX_GENERATOR ?= $(BUILDSUPPORTDIR)/create_index.sh
 
 # Select default dist targets
 DIST_TARGETS += $(OUT_DIR)/root.tgz
@@ -266,7 +264,7 @@ ifeq ($(BUILDTYPE),release)
 $(RAUC_UPDATEFILE): $(RAUC_UPDATEFILE_ORIGINAL) $(RAUC_CERTIFICATE) $(RAUC_KEY) $(RAUC_KEYRING) Makefile | $(OUT_DIR)
 	@echo "Create RAUC update file \"$@\" for build type $(BUILDTYPE) by resign with key \"$(RAUC_KEY)\""
 	   rm -f $@ \
-	&& $(RAUC_CMD) resign --cert=$(RAUC_CERTIFICATE) --key=$(RAUC_KEY) --keyring=$(RAUC_KEYRING) --signing-keyring=$(RAUC_DISTINCT_KEYRING) $< $@
+	&& PATH="$$PATH:$(PTXDIST_SYSROOT_HOST_PATH)" $(RAUC_CMD) resign --debug --no-verify --cert=$(RAUC_CERTIFICATE) --key=$(RAUC_KEY) --keyring=$(RAUC_KEYRING) --signing-keyring=$(RAUC_DISTINCT_KEYRING)  $< $@
 else
 $(RAUC_UPDATEFILE): $(RAUC_UPDATEFILE_ORIGINAL) Makefile | $(OUT_DIR)
 	@echo "Create RAUC update file \"$@\" for build type $(BUILDTYPE) by copy"

ptxproj/configs/wago-pfcXXX/config/images/boot-vfat-mlo-barebox-pfc.config

@@ -1,15 +1,10 @@
 image @IMAGE@ {
 	vfat {
 		extraargs="-n BOOT -i 7761676F"
-		file mlo.pfc100 { image = "barebox-am33xx-pfc-750-810x-mlo.img"}
-		file mlo.pfc200 { image = "barebox-am35xx-pfc-750-820x-mlo.img"}
-		file mlo.pfc200v2 { image = "barebox-am33xx-pfc-750-8208-mlo.img"}
+		file mlo.pfc100g2 { image = "barebox-am33xx-pfc-750-811x-mlo.img"}
 		file mlo.pfc200v3 { image = "barebox-am33xx-pfc-750-821x-mlo.img"}
-		file barebox.bin.pfc100 { image = "barebox-am33xx-pfc-750-810x.img" }
-		file barebox.bin.pfc200 { image = "barebox-am35xx-pfc-750-820x.img" }
-		file barebox.bin.pfc200v2 { image = "barebox-am33xx-pfc-750-8208.img" }
+		file barebox.bin.pfc100g2 { image = "barebox-am33xx-pfc-750-811x.img" }
 		file barebox.bin.pfc200v3 { image = "barebox-am33xx-pfc-750-821x.img" }
-		file uImage { image = "uImage" }
 	}
 	name = boot-mlo
 	size = 16M

ptxproj/configs/wago-pfcXXX/config/images/firmware.config

@@ -1,18 +1,6 @@
-image mlo.pfc100 {
+image mlo.pfc100g2 {
 	file {
-		name = "barebox-am33xx-pfc-750-810x-mlo.img"
-	}
-}
-
-image mlo.pfc200 {
-	file {
-		name = "barebox-am35xx-pfc-750-820x-mlo.img"
-	}
-}
-
-image mlo.pfc200v2 {
-	file {
-		name = "barebox-am33xx-pfc-750-8208-mlo.img"
+		name = "barebox-am33xx-pfc-750-811x-mlo.img"
 	}
 }
 
@@ -22,21 +10,9 @@ image mlo.pfc200v3 {
         }
 }
 
-image barebox.bin.pfc100 {
-	file {
-		name = "barebox-am33xx-pfc-750-810x.img"
-	}
-}
-
-image barebox.bin.pfc200 {
-	file {
-		name = "barebox-am35xx-pfc-750-820x.img"
-	}
-}
-
-image barebox.bin.pfc200v2 {
+image barebox.bin.pfc100g2 {
 	file {
-		name = "barebox-am33xx-pfc-750-8208.img"
+		name = "barebox-am33xx-pfc-750-811x.img"
 	}
 }
 
@@ -46,12 +22,6 @@ image barebox.bin.pfc200v3 {
         }
 }
 
-image uImage {
-	file {
-		name = "uImage"
-	}
-}
-
 image root.tgz {
 	file {}
 }

ptxproj/configs/wago-pfcXXX/config/images/rauc.config

@@ -1,13 +1,9 @@
 image update.raucb {
 	rauc {
 		file root.tar.gz { image = "root.tgz" }
-		file mlo.pfc100 { image = "barebox-am33xx-pfc-750-810x-mlo.img"}
-		file mlo.pfc200 { image = "barebox-am35xx-pfc-750-820x-mlo.img"}
-		file mlo.pfc200v2 { image = "barebox-am33xx-pfc-750-8208-mlo.img"}
+		file mlo.pfc100g2 { image = "barebox-am33xx-pfc-750-811x-mlo.img"}
 		file mlo.pfc200v3 { image = "barebox-am33xx-pfc-750-821x-mlo.img"}
-		file barebox.bin.pfc100 { image = "barebox-am33xx-pfc-750-810x.img" }
-		file barebox.bin.pfc200 { image = "barebox-am35xx-pfc-750-820x.img" }
-		file barebox.bin.pfc200v2 { image = "barebox-am33xx-pfc-750-8208.img" }
+		file barebox.bin.pfc100g2 { image = "barebox-am33xx-pfc-750-811x.img" }
 		file barebox.bin.pfc200v3 { image = "barebox-am33xx-pfc-750-821x.img" }
 		file barebox-compatible-versions { image = "../root/etc/barebox-compatible-versions" }
 
@@ -18,6 +14,9 @@ image update.raucb {
 			build=@RAUC_BUNDLE_BUILD@
 			description=@RAUC_BUNDLE_DESCRIPTION@
 
+			[bundle]
+			format=@RAUC_BUNDLE_FORMAT@
+
 			[hooks]
 			filename=hooks.sh
 

ptxproj/configs/wago-pfcXXX/config/images/sd.config

@@ -3,7 +3,7 @@ image @IMAGE@ {
         align = 8M
         disk-signature = 0x7364
     }
-    size = 240M
+    size = 290M
     partition boot {
         image = boot.vfat
         partition-type = 0x0C
@@ -12,6 +12,6 @@ image @IMAGE@ {
     partition root {
         image = root.ext2
         partition-type = 0x83
-        size = 150M
+        size = 250M
     }
 }