Skip to content

Commit

Permalink
Update 04.04.03-FW26
Browse files Browse the repository at this point in the history
  • Loading branch information
dicksimon committed Nov 8, 2023
1 parent 22cea61 commit 29e5e92
Show file tree
Hide file tree
Showing 1,086 changed files with 20,854 additions and 23,148 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ ptxproj/src/nss-3.54.tar.gz filter=lfs diff=lfs merge=lfs -text
ptxproj/src/boost_1_68_0.tar.bz2 filter=lfs diff=lfs merge=lfs -text
ptxproj/src/linux-*.tgz filter=lfs diff=lfs merge=lfs -text
ptxproj/src/go1.18.7.linux-amd64.tar.gz 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
14 changes: 14 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
Firmware Release 04.03.04 (26) - CODESYS 3

Engineering by CODESYS IDE V. 3.5 is supported
Engineering by e!COCKPIT IDE 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

Runtime System:
[NEW] Codesys3 Runtime-System 3.5.19.20
[CHANGED] Access blocking for 1h after 5 login failures

################################################################################

Firmware Release 04.03.03 (25) - CODESYS 3

Engineering by CODESYS IDE V. 3.5 is supported
Expand Down
24 changes: 11 additions & 13 deletions ptxproj/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -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
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions ptxproj/configs/vtp-ctp/config/images/rauc.config
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ image update.raucb {
build=@RAUC_BUNDLE_BUILD@
description=@RAUC_BUNDLE_DESCRIPTION@

[bundle]
format=@RAUC_BUNDLE_FORMAT@

[hooks]
filename=hooks.sh

Expand Down
Binary file modified ptxproj/configs/vtp-ctp/packages/TscIoBacnet_2.0.2_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/TscPPCodesys3App_0.1.1_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/canopen_1.4_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/canopen_1.4_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-cmpcanconfig_0.0.1_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-iodrvcanl2_1.0.2_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-iodrvcanm_1.0.2_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-iodrvcans_1.0.3_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-iodrvdal_0.0.1_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-iodrvdal_0.0.1_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-iodrvdps_0.0.2_armhf.ipk
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-iodrvserial_0.0.1_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscasyncmgr_0.0.1_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tsccomextra_0.0.1_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tsccomswitch_0.0.4_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tsccurl_0.0.4_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tsccurl_0.0.4_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscdpslib_0.0.1_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscdpslib_0.0.1_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscexttask_0.0.1_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscexttask_0.0.1_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscled_0.0.3_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscled_0.0.3_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscoms_0.0.1_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscoms_0.0.1_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscprocess_0.1.0_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscretainuio_0.0.2_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscrunled_0.0.2_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscsecure_2.1.2_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscsnmp_0.0.1_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscsnmp_0.0.1_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscsysext_0.2.1_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscsysext_0.2.1_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscsyslog_0.0.1_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscsyslog_0.0.1_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/cds3-tscuserdb_0.0.1_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/checksystem_0.0.1_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/codesys-3.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/dal_0.0.1_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/dal_0.0.1_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/dalshell_1.0_armhf.ipk
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/drm.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/drm_1.1.3_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/fp_x509-pkey_0.2.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/fwupdate_0.1.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/io-check_1.5_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/io_check.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/libModbusConfig.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/libbacnet_2.0.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/libbacnetconfig_1.7.2_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/libdpc31Driver_trunk_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/libdpc31Stack_main_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/libdps_trunk_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/libdps_trunk_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/libmodbusconfig_0.0.2_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/libpackbus.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/libpackbus_1.0.0_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/libwagodrm_1.0.1_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/libwserial_0.1.5_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/licenses_1.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/log-system-info_0.1.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/oms_0.2.0_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_activesystem_1.0.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_bacnet_1.0.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_codesys3_1.0.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_combo_1.0.0_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_display_1.0.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_docker_1.0.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_filetransfer_1.0.0_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_lighttpd_2.0.1_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_memorycard_1.0.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_netconf_1.0.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_networking_1.1.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_networktime_1.0.0_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_reboot_1.0.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_routing_1.0.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_secureshell_1.0.0_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_services_1.0.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_snmp_1.0.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_switchconfig_1.1.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_systemtime_1.0.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/pp_update-hs_1.0.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/progexecd.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/progexecd_2.0.1_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/start_microbrowser_1_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/svnrevision_1.0_armhf.ipk
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/typelabel.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/typelabel_1.0.0_armhf.ipk
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/wago-system_0.1.0_armhf.tgz
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/wago-trace_0.1.0_armhf.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ptxproj/configs/vtp-ctp/packages/wstd_1.2.4-164189503076_armhf.tgz
Binary file not shown.
18 changes: 12 additions & 6 deletions ptxproj/configs/vtp-ctp/platformconfig
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,16 @@ PTXCONF_TARGET_EXTRA_CFLAGS="-march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3 -ftree-
PTXCONF_TARGET_EXTRA_CXXFLAGS="-march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3 -ftree-vectorize"
PTXCONF_TARGET_EXTRA_LDFLAGS="-march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3 -ftree-vectorize"
PTXCONF_KERNEL=y
PTXCONF_KERNEL_ARTIFACTORY=y
PTXCONF_KERNEL_URL_TEMPLATE="%ARTIFACTORY_BASE_URL%/kernel-generic-prod/wago/linux/release/am3xxx_pfc_generic/am3xxx_pfc_generic-%VERSION%/.build/deploy/linux-%VERSION%.tgz"
PTXCONF_KERNEL_RT_PATCH="rt62"
PTXCONF_KERNEL_LOCALVERSION="w04.02.02"
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="342939fecc88e8d34b10b527ae914504"
PTXCONF_KERNEL_RT_PATCH="rt62"
PTXCONF_KERNEL_LOCALVERSION="w04.01.11"
PTXCONF_KERNEL_MD5="a587c9b8edabf1b249fc5cb18813e9b8"
# PTXCONF_KERNEL_IMAGE_BZ is not set
# PTXCONF_KERNEL_IMAGE_Z is not set
# PTXCONF_KERNEL_IMAGE_XIP is not set
Expand All @@ -126,7 +127,8 @@ PTXCONF_KERNEL_IMAGE_U=y
# PTXCONF_KERNEL_IMAGE_RAW is not set
# PTXCONF_KERNEL_IMAGE_SIMPLE is not set
PTXCONF_KERNEL_IMAGE_U_TARGET="linux"
PTXCONF_KERNEL_IMAGE="${PTXCONF_KERNEL_IMAGE_U_TARGET}"
PTXCONF_KERNEL_IMAGE="uImage"
# PTXCONF_KERNEL_DTB is not set
# PTXCONF_KERNEL_XZ is not set
# PTXCONF_KERNEL_LZOP is not set
# PTXCONF_KERNEL_LZ4 is not set
Expand Down Expand Up @@ -171,11 +173,11 @@ PTXCONF_CONSOLE_SPEED="115200"
# PTXCONF_AT91BOOTSTRAP2 is not set
PTXCONF_BAREBOX_ARCH_STRING="arm"
PTXCONF_BAREBOX=y
PTXCONF_BAREBOX_URL_TEMPLATE="%ARTIFACTORY_BASE_URL%/kernel-generic-prod/wago/barebox/release/imx6_vtpctp/imx6_vtpctp-%VERSION%/.build/deploy/barebox-%VERSION%.tgz"
PTXCONF_BAREBOX_VERSION="2021.10.0"
PTXCONF_BAREBOX_LOCALVERSION="w04.01.06_14"
PTXCONF_BAREBOX_MD5="d028eceadd2ebff173251b179a4525d6"
PTXCONF_BAREBOX_CONFIG="imx6_vtpctp_defconfig"
PTXCONF_BAREBOX_URL_TEMPLATE="%ARTIFACTORY_BASE_URL%/kernel-generic-prod/wago/barebox/release/imx6_vtpctp/imx6_vtpctp-%VERSION%/.build/deploy/barebox-%VERSION%.tgz"
PTXCONF_BAREBOX_LOCALVERSION="w04.01.06_14"
# PTXCONF_BAREBOX_EXTRA_ENV is not set
# PTXCONF_BAREBOX_BAREBOXENV is not set
# PTXCONF_BAREBOX_UIMAGE is not set
Expand Down Expand Up @@ -223,7 +225,11 @@ PTXCONF_IMAGE_KERNEL=y
PTXCONF_IMAGE_KERNEL_INSTALL_EARLY=y
# PTXCONF_IMAGE_KERNEL_LZOP is not set
PTXCONF_IMAGE_RAUC=y
PTXCONF_IMAGE_RAUC_CONFIG="rauc.config"
PTXCONF_IMAGE_RAUC_DESCRIPTION="Test Firmware"
PTXCONF_IMAGE_RAUC_BUNDLE_FORMAT_PLAIN=y
# PTXCONF_IMAGE_RAUC_BUNDLE_FORMAT_VERITY is not set
# PTXCONF_IMAGE_RAUC_BUNDLE_FORMAT_CRYPT is not set
PTXCONF_RAUC_BUNDLE_CONF=y
# PTXCONF_IMAGE_ROOT_CPIO_GZ is not set
# PTXCONF_IMAGE_ROOT_CPIO is not set
Expand Down
33 changes: 32 additions & 1 deletion ptxproj/configs/vtp-ctp/platforms/image-rauc.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,48 @@ menuconfig IMAGE_RAUC
slot with the content from PTXdist's root file system .tgz image.

To customize the bundle, copy and adapt the genimage configuration
file rauc.config.
in configs/images/rauc.config.

if IMAGE_RAUC

config IMAGE_RAUC_CONFIG
string
prompt "RAUC config file"
default "rauc.config"
help
rauc config file for this platform

config IMAGE_RAUC_DESCRIPTION
prompt "RAUC Bundle Description PFC"
string
default ""
help
Optional description that will be placed in the Bundles metadata.

choice
prompt "Bundle format"
default IMAGE_RAUC_BUNDLE_FORMAT_PLAIN

config IMAGE_RAUC_BUNDLE_FORMAT_PLAIN
bool "plain"
help
The old bundle format, which since rauc 1.5 is now known as 'plain'.

config IMAGE_RAUC_BUNDLE_FORMAT_VERITY
bool "verity"
help
The improved 'verity' bundle format

config IMAGE_RAUC_BUNDLE_FORMAT_CRYPT
bool "crypt"
help
The 'crypt' bundle format for fully encryptable bundles

Note that you must run 'rauc encrypt' on a crypt bundle to generate a
fully encrypted bundle.

endchoice

config RAUC_BUNDLE_CONF
bool

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ bootloader=barebox
mountprefix=/mnt/rauc
variant-name=EC752
barebox-statename=bootstate
bundle-formats=plain verity

[keyring]
path=/etc/rauc/ca.cert.pem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ bootloader=barebox
mountprefix=/mnt/rauc
variant-name=TP600
barebox-statename=bootstate
bundle-formats=plain verity

[keyring]
path=/etc/rauc/ca.cert.pem
Expand Down
37 changes: 25 additions & 12 deletions ptxproj/configs/vtp-ctp/ptxconfig_generic
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ PTXCONF_HOST_XORG_SERVER=y
PTXCONF_HOST_XORG_UTIL_MACROS=y
PTXCONF_HOST_XORGPROTO=y
PTXCONF_HOST_ZLIB=y
PTXCONF_CODE_SIGNING=y
PTXCONF_HOST_AUTOTOOLS_AUTOCONF=y
PTXCONF_HOST_AUTOTOOLS_AUTOMAKE=y
PTXCONF_HOST_AUTOTOOLS_LIBTOOL=y
Expand Down Expand Up @@ -602,7 +603,6 @@ PTXCONF_BC=y
# PTXCONF_BSDIFF is not set
PTXCONF_BUSYBOX=y
PTXCONF_BUSYBOX_INETD_STARTSCRIPT=y
# PTXCONF_BUSYBOX_FTPD_INETD is not set
PTXCONF_BUSYBOX_UDHCPD_STARTSCRIPT=y
PTXCONF_BUSYBOX_CROND_STARTSCRIPT=y
# PTXCONF_BUSYBOX_HWCLOCK_STARTSCRIPT is not set
Expand Down Expand Up @@ -1271,10 +1271,7 @@ PTXCONF_BUSYBOX_FEATURE_BRCTL_FANCY=y
PTXCONF_BUSYBOX_FEATURE_BRCTL_SHOW=y
# PTXCONF_BUSYBOX_DNSD is not set
# PTXCONF_BUSYBOX_ETHER_WAKE is not set
PTXCONF_BUSYBOX_FTPD=y
PTXCONF_BUSYBOX_FEATURE_FTPD_WRITE=y
PTXCONF_BUSYBOX_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
PTXCONF_BUSYBOX_FEATURE_FTPD_AUTHENTICATION=y
# PTXCONF_BUSYBOX_FTPD is not set
PTXCONF_BUSYBOX_FTPGET=y
PTXCONF_BUSYBOX_FTPPUT=y
# PTXCONF_BUSYBOX_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
Expand Down Expand Up @@ -2551,7 +2548,7 @@ PTXCONF_LIBCURL_CURL=y
PTXCONF_LIBCURL_HTTP=y
# PTXCONF_LIBCURL_COOKIES is not set
PTXCONF_LIBCURL_FTP=y
# PTXCONF_LIBCURL_TFTP is not set
PTXCONF_LIBCURL_TFTP=y
# PTXCONF_LIBCURL_FILE is not set
PTXCONF_LIBCURL_SMTP=y
# PTXCONF_LIBCURL_VERBOSE is not set
Expand Down Expand Up @@ -2781,8 +2778,7 @@ PTXCONF_PUREFTPD_INSTALL_CUSTOM_CONFIG_FILE=y
# PTXCONF_PUREFTPD_VIRTUALHOSTS is not set
PTXCONF_PUREFTPD_SSL=y
# PTXCONF_PUREFTPD_DIRALIASES is not set
PTXCONF_PUREFTPD_MINIMAL=y
# PTXCONF_PUREFTPD_SHRINK_MORE is not set
# PTXCONF_PUREFTPD_MINIMAL is not set
PTXCONF_PUREFTPD_STARTSCRIPT=y
# PTXCONF_PYTHON3_DJANGO is not set
# PTXCONF_QUAGGA is not set
Expand Down Expand Up @@ -3017,21 +3013,27 @@ PTXCONF_DOCKER_CLI=y
PTXCONF_DOCKER_USERLAND_PROXY=y
PTXCONF_DOCKER=y
PTXCONF_DOCKER_INSTALL_TO_HOMEDIR=y
# PTXCONF_DOCKER_ACTIVATE_ON_FIRST_BOOT is not set
PTXCONF_DOCKERD=y
# PTXCONF_FFMPEG is not set
# PTXCONF_GNUPG is not set
# PTXCONF_LPC21ISP is not set
# PTXCONF_MYSQLDB is not set
PTXCONF_RAUC=y
PTXCONF_RAUC_SERVICE=y
PTXCONF_RAUC_NETWORK=y
# PTXCONF_RAUC_JSON is not set
PTXCONF_RAUC_CONFIGURATION=y
PTXCONF_RAUC_COMPATIBLE="${PTXCONF_PROJECT_VENDOR} ${PTXCONF_PROJECT}"
PTXCONF_RAUC_FORMAT="plain"
PTXCONF_RAUC_BUNDLE_VERSION="${PTXDIST_BSP_AUTOVERSION}"
PTXCONF_RAUC_DEVELOPMENT_KEY="config/rauc/WAGO_BU_Automation_Development_Certificate.pem"
PTXCONF_RAUC_RELEASE_KEY=""
PTXCONF_RAUC_DEVELOPMENT_CERT="config/rauc/WAGO_BU_Automation_Development_Certificate.crt"
PTXCONF_RAUC_RELEASE_CERT="config/rauc/WAGO_BU_Automation_Release_Certificate.crt"
PTXCONF_RAUC_DEVELOPMENT_KEYRING="config/rauc/WAGO_BU_Automation_Development_Certificate.crt"
PTXCONF_RAUC_RELEASE_KEYRING="config/rauc/WAGO_BU_Automation_Release_Certificate.crt"
# PTXCONF_RAUC_BAREBOX is not set
PTXCONF_ROOTLESSKIT_DEP=y
PTXCONF_ROOTLESSKIT=y
PTXCONF_RUNC=y
Expand Down Expand Up @@ -3972,7 +3974,7 @@ PTXCONF_GDK_PIXBUF_LOADER_PNG=y
# PTXCONF_GLIB_NETWORKING is not set
PTXCONF_GLIB=y
PTXCONF_GLIB_GDBUS=y
# PTXCONF_GLIB_LIBMOUNT is not set
PTXCONF_GLIB_LIBMOUNT=y
# PTXCONF_GLIBMM is not set
# PTXCONF_GOBJECT_INTROSPECTION_HELPER is not set
# PTXCONF_GTK_ENGINES is not set
Expand Down Expand Up @@ -4453,6 +4455,7 @@ PTXCONF_CANUTILS_CANCONFIG=y
#
# Wago Specific
#
PTXCONF_DHCP_GET_VENDOR_INFO=y
PTXCONF_FACTORY_SETTINGS=y
PTXCONF_FP_X509_PKEY=y
PTXCONF_HOST_CT_BUILD=y
Expand All @@ -4463,6 +4466,15 @@ PTXCONF_LICENSE_INFO=y
PTXCONF_LICENSES=y
# PTXCONF_PFC_200_G2 is not set
PTXCONF_LOG_SYSTEM_INFO=y
PTXCONF_ONLINE_UPDATE=y
PTXCONF_WAGO_AUTH_OPENAPI=y
PTXCONF_WAGO_AUTH_OPENAPI_HTML=y
PTXCONF_WAGO_AUTH_OPENAPI_URL_TEMPLATE="%ARTIFACTORY_BASE_URL%/wdx-npm-prod-local/@wago/openapi-auth/-/openapi-auth-%VERSION%.tgz"
PTXCONF_WAGO_AUTH_SERVICE=y
PTXCONF_WAGO_AUTH_SERVICE_LIB=y
PTXCONF_WAGO_AUTH_SERVICE_DAEMON=y
PTXCONF_WAGO_AUTH_SERVICE_DAEMON_STARTSCRIPT=y
PTXCONF_WAGO_AUTH_SERVICE_LIGHTTPD_INTEGRATION=y

#
# ------------------------------------
Expand All @@ -4476,6 +4488,9 @@ PTXCONF_WAGO_BUILD_COLLECTION=""
#
# ------------------------------------
#
PTXCONF_WAGO_LOGGING=y
PTXCONF_WAGO_OPTPARSING=y
PTXCONF_WAGO_PRIVILEGES=y
# PTXCONF_WAGO_TOOLS_BUILD_VERSION_TRUNK is not set
# PTXCONF_WAGO_TOOLS_BUILD_VERSION_RELEASE is not set
PTXCONF_WAGO_TOOLS_BUILD_VERSION_BINARIES=y
Expand All @@ -4487,7 +4502,7 @@ PTXCONF_WAGO_TOOLS_BUILD_VERSION_BINARIES=y
#
# Artifactory
#
PTXCONF_ARTIFACTORY_BASE_URL="https://artifactory"
PTXCONF_ARTIFACTORY_BASE_URL="https://artifactory.wago.local"

#
# ------------------------------------
Expand All @@ -4499,7 +4514,6 @@ PTXCONF_ARTIFACTORY_BASE_URL="https://artifactory"
PTXCONF_WAGO_PARAMETER_SERVICE_APITEST=y
PTXCONF_WAGO_PARAMETER_SERVICE_COM=y
PTXCONF_WAGO_PARAMETER_SERVICE_COM_LIB=y
PTXCONF_WAGO_PARAMETER_SERVICE_COM_LOGGING=y
PTXCONF_WAGO_PARAMETER_SERVICE_CLIENT_LIB=y
PTXCONF_WAGO_PARAMETER_SERVICE_TEST_LIB=y
PTXCONF_WAGO_PARAMETER_SERVICE_CORE=y
Expand Down Expand Up @@ -4735,7 +4749,6 @@ PTXCONF_TYPELABEL_SETFWNR=y
#
PTXCONF_CPPUTEST=y
PTXCONF_HOSTLIBLOADER=y
PTXCONF_LIBBRIDGE=y
PTXCONF_LIBCGROUPCPULOAD=y
PTXCONF_LIBMODBUSCONFIG=y
PTXCONF_LIBOSLINUX=y
Expand Down
Loading

0 comments on commit 29e5e92

Please sign in to comment.