Update 04.06.03-FW28P1

.gitignore

@@ -55,4 +55,11 @@
 /ptxproj/platform-*/
 /ptxproj/selected_platformconfig
 /ptxproj/selected_ptxconfig
-/ptxproj/selected_toolchain
+/ptxproj/selected_toolchain
+/ptxproj/src/*.gz
+/ptxproj/src/*.tgz
+/ptxproj/src/*.xz
+/ptxproj/src/*.bz2
+/ptxproj/src/*.zip
+/ptxproj/src/*.md5
+/ptxproj/src/*.tar

Changelog

@@ -1,3 +1,18 @@
+Firmware Release 04.06.03 (28)
+
+System:
+[NEW]   With FW28, CC100 with part numbers 751-9402 and 751-9402/000-001 are
+        supported.
+[NEW]   751-9402, 751-9402/000-001: Configuration of the on-board I/Os enabled
+        with engineering tools using the WDx interface
+
+Runtime System:
+[-]
+
+Web Based Management:
+[-]
+
+################################################################################
 Firmware Release 04.05.10 (27)
 
 System:

README.md

@@ -59,7 +59,7 @@ If you prefer to build the sdk-builder image manually follow instruction provide
 ### 1.) Check out the correct release
 We provide one tag for each firmware(FW) release. You can download specific FW versions in the release section. Alternatively you may use git to clone the repository.  
 
-    git clone git@github.com:WAGO/cc100-firmware-sdk.git && cd cc100-firmware-sdk
+    git clone https://github.com/WAGO/cc100-firmware-sdk.git && cd cc100-firmware-sdk
 
 Afterward you can checkout a specific release.
 

ptxproj/Makefile

@@ -53,12 +53,21 @@ else ifeq ($(PLATFORM),wago-pfcXXX-hardened)
 FIRMWARE_PLATFORM ?= PFC-G2-Linux-hardened
 else ifeq ($(PLATFORM),vtp-ctp)
 FIRMWARE_PLATFORM ?= TP-Linux
+else ifeq ($(PLATFORM),wago-wp400)
+FIRMWARE_PLATFORM ?= WP400-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
 DIST_TARGETS += $(OUT_DIR)/$(fsbl)
+$(OUT_DIR)/$(fsbl): $(IMAGE_DIR)/$(fsbl) | $(OUT_DIR)
+	@echo "Create cc100 fsbl $(fsbl) by copy: $<"
+	cp $< $@
+else ifeq ($(PLATFORM),cc100-hardened)
+FIRMWARE_PLATFORM ?= CC100-Linux-hardened
+fsbl := stm32mp1-tf-a-stm32mp151-cc100.stm32
+DIST_TARGETS += $(OUT_DIR)/$(fsbl)
 $(OUT_DIR)/$(fsbl): $(IMAGE_DIR)/$(fsbl) | $(OUT_DIR)
 	@echo "Create cc100 fsbl $(fsbl) by copy: $<"
 	cp $< $@
@@ -140,6 +149,7 @@ SBOM = $(OUT_DIR)/sbom.txt
 
 # Select default dist targets
 DIST_TARGETS += $(OUT_DIR)/root.tgz
+DIST_TARGETS += $(OUT_DIR)/root.ext2
 DIST_TARGETS += $(GENIMAGE_CONFIGS)
 DIST_TARGETS ?=
 DIST_TARGETS += $(FW_DESC_FILES)
@@ -254,6 +264,10 @@ $(OUT_DIR)/root.tgz: $(IMAGE_DIR)/root.tgz | $(OUT_DIR)
 	@echo "Create versioned root.tgz and image configs by copy: $<"
 	cp $< $@
 
+$(OUT_DIR)/root.ext2: $(IMAGE_DIR)/root.ext2 | $(OUT_DIR)
+	@echo "Create versioned root.ext2 and image configs by copy: $<"
+	cp $< $@
+
 $(IMAGES_ARCHIVE): $(OUT_DIR)/ptxdist.images.stage | $(OUT_DIR)
 	@echo "Create image archive"
 	tar -cvzf $@ -C $(IMAGE_DIR) .

ptxproj/config/meson/glib-cross-file.meson

@@ -0,0 +1,9 @@
+[properties]
+have_proc_self_cmdline = true
+have_c99_vsnprintf = true
+have_c99_snprintf = true
+have_unix98_printf = true
+va_val_copy = true
+
+[binaries]
+env = '/usr/bin/env'

ptxproj/config/qt5/linux-ptx-g++/qmake.conf

@@ -14,17 +14,12 @@ include(../common/g++-unix.conf)
 
 SYSROOT_DIR = USER_SYSROOT_DIR
 CROSS = CROSS_PREFIX
+COMPILER_FLAGS = IMX_FLAGS
 
 # settings for hardfloat
 DISTRO_OPTS 	+= "hard-float"
-#QMAKE_CXXFLAGS += -O3 -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=hard -DLINUX=1 -DEGL_API_FB=1 --sysroot=/opt/OSELAS.Toolchain-2014.12.2/arm-v7a-linux-gnueabihf/gcc-4.9.2-glibc-2.20-binutils-2.24-kernel-3.16-sanitized/sysroot-arm-v7a-linux-gnueabihf -L/opt/OSELAS.Toolchain-2014.12.2/arm-v7a-linux-gnueabihf/gcc-4.9.2-glibc-2.20-binutils-2.24-kernel-3.16-sanitized/sysroot-arm-v7a-linux-gnueabihf/usr/lib
-#QMAKE_CFLAGS 	+= -O3 -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=hard -DLINUX=1 -DEGL_API_FB=1 --sysroot=/opt/OSELAS.Toolchain-2014.12.2/arm-v7a-linux-gnueabihf/gcc-4.9.2-glibc-2.20-binutils-2.24-kernel-3.16-sanitized/sysroot-arm-v7a-linux-gnueabihf -L/opt/OSELAS.Toolchain-2014.12.2/arm-v7a-linux-gnueabihf/gcc-4.9.2-glibc-2.20-binutils-2.24-kernel-3.16-sanitized/sysroot-arm-v7a-linux-gnueabihf/usr/lib
-#QMAKE_CXXFLAGS += -O3 -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard -DLINUX=1 -DEGL_API_FB=1 --sysroot=/opt/OSELAS.Toolchain-2014.12.2/arm-v7a-linux-gnueabihf/gcc-4.9.2-glibc-2.20-binutils-2.24-kernel-3.16-sanitized/sysroot-arm-v7a-linux-gnueabihf -L/opt/OSELAS.Toolchain-2014.12.2/arm-v7a-linux-gnueabihf/gcc-4.9.2-glibc-2.20-binutils-2.24-kernel-3.16-sanitized/sysroot-arm-v7a-linux-gnueabihf/usr/lib
-#QMAKE_CFLAGS   += -O3 -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard -DLINUX=1 -DEGL_API_FB=1 --sysroot=/opt/OSELAS.Toolchain-2014.12.2/arm-v7a-linux-gnueabihf/gcc-4.9.2-glibc-2.20-binutils-2.24-kernel-3.16-sanitized/sysroot-arm-v7a-linux-gnueabihf -L/opt/OSELAS.Toolchain-2014.12.2/arm-v7a-linux-gnueabihf/gcc-4.9.2-glibc-2.20-binutils-2.24-kernel-3.16-sanitized/sysroot-arm-v7a-linux-gnueabihf/usr/lib
-QMAKE_CXXFLAGS += -O3 -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard -DLINUX=1 -DEGL_API_FB=1 -DXCB_USE_EGL -DXCB_USE_GLX
-QMAKE_CFLAGS   += -O3 -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard -DLINUX=1 -DEGL_API_FB=1 -DXCB_USE_EGL -DXCB_USE_GLX
-
-#./configure CFLAGS=--sysroot=/ LDFLAGS=--sysroot=/ --disable-qt --disable-gtk --build i686-pc-linux-gnu --host arm-linux-gnueabi
+QMAKE_CXXFLAGS += $${COMPILER_FLAGS}
+QMAKE_CFLAGS   += $${COMPILER_FLAGS}
 
 #settings for softfloat
 #QMAKE_CXXFLAGS 	+= -O3 -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp -DLINUX=1 -DEGL_API_FB=1 --sysroot=/opt/OSELAS.Toolchain-2014.12.2/arm-v7a-linux-gnueabi/gcc-4.9.2-glibc-2.20-binutils-2.24-kernel-3.16-sanitized/sysroot-arm-v7a-linux-gnueabi -L/opt/OSELAS.Toolchain-2014.12.2/arm-v7a-linux-gnueabi/gcc-4.9.2-glibc-2.20-binutils-2.24-kernel-3.16-sanitized/sysroot-arm-v7a-linux-gnueabi/usr/lib
@@ -66,10 +61,4 @@ QMAKE_INCDIR			+= $${SYSROOT_DIR}/usr/include/gstreamer-1.0
 QMAKE_INCDIR			+= $${SYSROOT_DIR}/usr/include/libxml2
 QMAKE_INCDIR			+= $${SYSROOT_DIR}/usr/include/openssl
 
-#PKG_CONFIG_SYSROOT_DIR = $${SYSROOT_DIR}
-#PKG_CONFIG = $${SYSROOT_DIR}/../sysroot-cross/bin/pkg-config
-
-QT_QPA_DEFAULT_PLATFORM = xcb
-QT_XCB_GL_INTEGRATION = xcb_egl
-
 load(qt_config)

ptxproj/config/wpasupplicant/defconfig

@@ -101,6 +101,9 @@ CONFIG_EAP_MSCHAPV2=y
 
 # EAP-TLS
 CONFIG_EAP_TLS=y
+# Enable EAP-TLSv1.3 support by default (currently disabled unless explicitly
+# enabled in network configuration)
+#CONFIG_EAP_TLSV1_3=y
 
 # EAL-PEAP
 CONFIG_EAP_PEAP=y
@@ -203,9 +206,15 @@ CONFIG_HT_OVERRIDES=y
 # Support VHT overrides (disable VHT, mask MCS rates, etc.)
 CONFIG_VHT_OVERRIDES=y
 
+# Support HE overrides
+#CONFIG_HE_OVERRIDES=y
+
 # Development testing
 #CONFIG_EAPOL_TEST=y
 
+# Support IPv6
+CONFIG_IPV6=y
+
 # Select control interface backend for external programs, e.g, wpa_cli:
 # unix = UNIX domain sockets (default for Linux/*BSD)
 # udp = UDP sockets using localhost (127.0.0.1)
@@ -248,6 +257,9 @@ CONFIG_WPA_CLI_EDIT=y
 # Simultaneous Authentication of Equals (SAE), WPA3-Personal
 CONFIG_SAE=y
 
+# SAE Public Key, WPA3-Personal
+#CONFIG_SAE_PK=y
+
 # Disable scan result processing (ap_scan=1) to save code size by about 1 kB.
 # This can be used if ap_scan=1 mode is never enabled.
 #CONFIG_NO_SCAN_PROCESSING=y
@@ -389,6 +401,22 @@ CONFIG_TLSV12=y
 # amount of memory/flash.
 #CONFIG_DYNAMIC_EAP_METHODS=y
 
+# Dynamic library loading
+
+# Add the ability to configure libraries to load at compile time.
+# If set, these disable dynamic configuration.
+#CONFIG_PKCS11_ENGINE_PATH - pkcs11_engine library location.
+#CONFIG_PKCS11_MODULE_PATH - pkcs11_module library location.
+#CONFIG_OPENSC_ENGINE_PATH - opensc_engine library location.
+#
+# Prevent library loading at runtime
+#CONFIG_NO_PKCS11_ENGINE_PATH=y # prevents loading pkcs11_engine library.
+#CONFIG_NO_PKCS11_MODULE_PATH=y # prevents loading pkcs11_module library.
+# CONFIG_NO_OPENSC_ENGINE_PATH=y # prevents loading opensc_engine library.
+
+# Prevents loading EAP libraries at runtime
+#CONFIG_NO_LOAD_DYNAMIC_EAP=y
+
 # IEEE Std 802.11r-2008 (Fast BSS Transition) for station mode
 CONFIG_IEEE80211R=y
 
@@ -474,6 +502,16 @@ CONFIG_GETRANDOM=y
 # IEEE 802.11ac (Very High Throughput) support (mainly for AP mode)
 CONFIG_IEEE80211AC=y
 
+# IEEE 802.11ax HE support (mainly for AP mode)
+CONFIG_IEEE80211AX=y
+
+# IEEE 802.11be EHT support (mainly for AP mode)
+# CONFIG_IEEE80211AX is mandatory for setting CONFIG_IEEE80211BE.
+# Note: This is experimental and work in progress. The definitions are still
+# subject to change and this should not be expected to interoperate with the
+# final IEEE 802.11be version.
+#CONFIG_IEEE80211BE=y
+
 # Wireless Network Management (IEEE Std 802.11v-2011)
 # Note: This is experimental and not complete implementation.
 #CONFIG_WNM=y
@@ -633,3 +671,18 @@ CONFIG_DPP2=y
 # design is still subject to change. As such, this should not yet be enabled in
 # production use.
 #CONFIG_PASN=y
+
+# Disable support for Radio Measurement (IEEE 802.11k) and supported operating
+# class indication. Removing these is not recommended since they can help the
+# AP manage the network and STA steering.
+#CONFIG_NO_RRM=y
+
+# Disable support for Robust AV streaming for consumer and enterprise Wi-Fi
+# applications; IEEE Std 802.11-2020, 4.3.24; SCS, MSCS, QoS Management
+#CONFIG_NO_ROBUST_AV=y
+
+# Disable support for WMM admission control
+#CONFIG_NO_WMM_AC=y
+
+# Wi-Fi Aware unsynchronized service discovery (NAN USD)
+#CONFIG_NAN_USD=y

ptxproj/configs/cc100/platformconfig

@@ -110,13 +110,13 @@ PTXCONF_KERNEL=y
 PTXCONF_KERNEL_ARTIFACTORY=y
 PTXCONF_KERNEL_URL_TEMPLATE="%ARTIFACTORY_BASE_URL%/kernel-generic-prod/wago/linux/release/stm32mp1/stm32mp1-%VERSION%/.build/deploy/linux-%VERSION%.tgz"
 PTXCONF_KERNEL_RT_PATCH="rt62"
-PTXCONF_KERNEL_LOCALVERSION="w04.03.05"
+PTXCONF_KERNEL_LOCALVERSION="w04.03.06"
 PTXCONF_KERNEL_XPKG=y
 PTXCONF_KERNEL_INSTALL=y
 PTXCONF_KERNEL_MODULES=y
 PTXCONF_KERNEL_MODULES_INSTALL=y
 PTXCONF_KERNEL_VERSION="5.15.107"
-PTXCONF_KERNEL_MD5="d76fec8e06d56f3edbd9fed5531b6226"
+PTXCONF_KERNEL_MD5="a19a38fb658ae3f41d4a2b16205ee578"
 # PTXCONF_KERNEL_IMAGE_BZ is not set
 # PTXCONF_KERNEL_IMAGE_Z is not set
 # PTXCONF_KERNEL_IMAGE_XIP is not set
@@ -175,8 +175,8 @@ PTXCONF_BAREBOX_ARCH_STRING="arm"
 PTXCONF_BAREBOX=y
 PTXCONF_BAREBOX_URL_TEMPLATE="%ARTIFACTORY_BASE_URL%/kernel-generic-prod/wago/barebox/release/stm32mp_cc100/stm32mp_cc100-%VERSION%/.build/deploy/barebox-%VERSION%.tgz"
 PTXCONF_BAREBOX_VERSION="2021.10.0"
-PTXCONF_BAREBOX_LOCALVERSION="w04.03.02_15"
-PTXCONF_BAREBOX_MD5="02b5b7b7814b6384be08ba6a565a3753"
+PTXCONF_BAREBOX_LOCALVERSION="w04.03.03_15"
+PTXCONF_BAREBOX_MD5="07116c17019d40f01ab7d9f914d71725"
 PTXCONF_BAREBOX_CONFIG="stm32mp_cc100_defconfig"
 # PTXCONF_BAREBOX_EXTRA_ENV is not set
 # PTXCONF_BAREBOX_BAREBOXENV is not set