Skip to contentSkip to conversation

Updates for the siemens cxg3 for 2025.07

PATCH Applied Heiko Schocher 2 participants 7 messages Apr 28, 2025 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

v2 cover Updates for the siemens cxg3 for 2025.07

some small updates for the cxg3 board:

- collect common Kconfig options in an include file, which
makes syncing downstream defconfig files easier
- Move the U-Boot Environment setttings in a txt file
- minor defconfig updates
- remove now unused file include/configs/giedi.h
- base is now
62ea9c329a0 - (origin/master, origin/HEAD) board: starfive: visionfive2: Order board detection logic to match config

Changes in v2:
- simple spelling change recomended from Fabio s/siemens/Siemens
- removed ipaddr and serverip as suggested from Fabio
- respelled commit subject and message as suggested from Fabio
- new patch arm: imx8qxp: capricorn: move env offset settings in v2
- patch siemens: imx8qxp: remove unused config file new in v2

Heiko Schocher (3):
imx8qxp: capricorn defconfig: collect common Kconfig options
arm: imx8qxp: capricorn: move env offset settings
siemens: imx8qxp: remove unused config file

Walter Schweizer (2):
siemens: capricorn: enable text based default environment
siemens: capricorn: defconfig updates

 board/siemens/capricorn/MAINTAINERS           |   1 +
 board/siemens/capricorn/capricorn_default.env |  49 +++++++
 configs/capricorn_cxg3_defconfig              | 135 +-----------------
 configs/imx8qxp_capricorn.config              | 134 +++++++++++++++++
 include/configs/capricorn-common.h            |  52 +------
 include/configs/giedi.h                       |  16 ---
 6 files changed, 192 insertions(+), 195 deletions(-)
 create mode 100644 board/siemens/capricorn/capricorn_default.env
 create mode 100644 configs/imx8qxp_capricorn.config
 delete mode 100644 include/configs/giedi.h
Signature · 4 lines
2.20.1

base-commit: 62ea9c329a0d013993bae538c55dfea06e4551bd
branch: feat/capricorn-upstream-hs
#1 lore raw

PATCH v2 1/5 imx8qxp: capricorn defconfig: collect common Kconfig options

Siemens have some defconfigs for different hardware versions, all based on mainline cxg3 board. For easier updating the downstream defconfigs, move common settings into new file.

configs/imx8qxp_capricorn.config

---

Changes in v2:
- simple spelling change recomended from Fabio
s/siemens/Siemens

 board/siemens/capricorn/MAINTAINERS |   1 +
 configs/capricorn_cxg3_defconfig    | 132 +--------------------------
 configs/imx8qxp_capricorn.config    | 135 ++++++++++++++++++++++++++++
 3 files changed, 140 insertions(+), 128 deletions(-)
 create mode 100644 configs/imx8qxp_capricorn.config
board/siemens/capricorn/MAINTAINERS +1 -0
index 5f467aa9b6e..3b4bd64dd00 100644
@@ -9,4 +9,5 @@ F:	arch/arm/dts/imx8-capricorn-u-boot.dtsi
 F:	arch/arm/dts/imx8-capricorn.dtsi
 F:	board/siemens/capricorn/
 F:	configs/capricorn_cxg3_defconfig
+F:	configs/imx8qxp_capricorn.config
 F:	include/configs/capricorn-common.h
configs/capricorn_cxg3_defconfig +4 -128

144 lines not on this page · raw message

configs/imx8qxp_capricorn.config new file +135 -0

135 lines not on this page · raw message

Signature · 1 line
2.20.1
#2 lore raw

PATCH v2 2/5 siemens: capricorn: enable text based default environment

In reply to Heiko Schocher

From: Walter Schweizer <[email protected]>

enable text based default U-Boot Environment by enabling CONFIG_ENV_SOURCE_FILE

and adding default environment file:

board/siemens/capricorn/capricorn_cxg3.env

---

Changes in v2:
- removed ipaddr and serverip as suggested from Fabio

 board/siemens/capricorn/capricorn_default.env | 49 +++++++++++++++++
 configs/capricorn_cxg3_defconfig              |  1 +
 include/configs/capricorn-common.h            | 52 +------------------
 3 files changed, 51 insertions(+), 51 deletions(-)
 create mode 100644 board/siemens/capricorn/capricorn_default.env
board/siemens/capricorn/capricorn_default.env new file +49 -0
new file mode 100644
index 00000000000..4c26e9d43eb
@@ -0,0 +1,49 @@
+altbootcmd=run bootcmd
+baudrate=115200
+bootcmd=run flash_self;reset;
+bootdelay=3
+bootdir=targetdir/rootfs/boot
+bootlimit=3
+check_upgrade=if test ${upgrade_available} -eq 1; then echo  upgrade_available is set; if test ${bootcount} -gt ${bootlimit}; then setenv upgrade_available 0;echo toggle partition;run toggle_partition;fi;fi;
+cntr_addr=0x88000000
+cntr_file=os_cntr_signed.bin
+console=ttyLP2
+dtb_name_default=default
+ethprime=eth1
+fdt_addr=0x83000000
+fdt_high=0xffffffffffffffff
+flash_self=run mmc_boot
+flash_self_test=setenv testargs test loglevel=3 systemd.unit=test.target; run mmc_boot
+hostname=capricorn
+initrd_addr=0x83100000
+initrd_high=0xffffffffffffffff
+ip_method=none
+kernel_name=Image
+loadaddr=0x80400000
+mmc_boot=run set_bootargs;run check_upgrade; run set_partition;run set_bootargs_mmc;run mmc_load_bootfiles
+mmc_boot_fit=ext4load mmc 0:${mmc_part_nr} 0x88000000 boot/fitImage;if test -n ${A};then setenv bootargs ${bootargs} rootfs_sig=${sig_a};fi;if test -n ${B};then setenv bootargs ${bootargs} rootfs_sig=${sig_b};fi;bootm 0x88000000#conf-${dtb_name}.dtb;bootm
+mmc_boot_image=ext4load mmc 0:${mmc_part_nr} ${fdt_addr} boot/${dtb_name}.dtb;if test $? -eq 1;then ext4load mmc 0:${mmc_part_nr} ${fdt_addr} boot/${dtb_name_default}.dtb;fi; ext4load mmc 0:${mmc_part_nr} ${loadaddr} boot/${kernel_name}; booti ${loadaddr} - ${fdt_addr}
+mmc_load_bootfiles=echo -n Loading from eMMC ...; if test -e mmc 0:${mmc_part_nr} boot/fitImage; then echo fit; setenv fdt_high; setenv initrd_high; run mmc_boot_fit; else echo image; run mmc_boot_image; fi
+net_nfs=wdt dev scu-wdt; wdt stop; echo Booting from network ...; run set_bootargs_net; tftpboot ${loadaddr} ${bootdir}/${kernel_name}; printenv bootargs; if test ${kernel_name} = fitImage; then setenv fdt_high; setenv initrd_high; bootm ${loadaddr}#conf-${dtb_name}.dtb; else tftpboot ${fdt_addr} ${serverip}:${bootdir}/${dtb_name}.dtb; if test $? -eq 1; then echo Loading default.dtb!; tftpboot ${fdt_addr} ${serverip}:${bootdir}/${dtb_name_default}.dtb; fi; booti ${loadaddr} - ${fdt_addr}; fi
+net_unfs=setenv nfsopts vers=3,udp,rsize=4096,wsize=4096,nolock,port=3049,mountport=3048 rw; run net_nfs
+netdev=lan0
+nfsopts=vers=3,udp,rsize=4096,wsize=4096,nolock rw
+partitionset_active=A
+rootfs_name=/dev/mmcblk0
+rootpath=/home/projects/targetdir/rootfs
+script_file=u-boot-commands.img
+set_bootargs_mmc=setenv bootargs ${bootargs} root=${mmc_active_vol} ro rootdelay=1 rootwait rootfstype=ext4 ip=${ip_method}
+set_bootargs_net=run set_bootargs; if test ${kernel_name} = fitImage; then setenv loadaddr 0x88000000; fi; setenv bootargs ${bootargs} root=/dev/nfs nfsroot=${serverip}:${rootpath},${nfsopts} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:${netdev}:off
+set_bootargs=setenv bootargs console=${console},${baudrate} target_env=${target_env} ${testargs} ${optargs}
+set_partition=setenv ${partitionset_active} true;if test -n ${A}; then setenv mmc_part_nr 1;fi;if test -n ${B}; then setenv mmc_part_nr 2;fi;setenv mmc_active_vol ${rootfs_name}p${mmc_part_nr}
+tftp_run_script=tftpboot ${kernel_loadaddr} ${serverip}:${script_file};if test $? -eq 0;then source ${kernel_loadaddr};fi
+toggle_partition=setenv ${partitionset_active} true; if test -n ${A}; then setenv partitionset_active B; mmc partconf 0 1 2 0; env delete A; fi; if test -n ${B}; then setenv partitionset_active A; mmc partconf 0 1 1 0; env delete B; fi;saveenv; reset
+upgrade_available=0
+emmc_dev=0
+sd_dev=1
+mfgtool_args=setenv bootargs console=${console},${baudrate} rdinit=/linuxrc clk_ignore_unused
+kboot=booti
+bootcmd_mfg=run mfgtool_args; if iminfo ${initrd_addr}; then if test ${tee} = yes; then bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; else booti ${loadaddr} ${initrd_addr} ${fdt_addr}; fi; else echo "Run fastboot ..."; fastboot usb auto; fi;
+fastboot_bytes=124c00
+fastboot_dev=mmc
+mmcautodetect=yes
configs/capricorn_cxg3_defconfig +1 -0
index 530b1f47695..5f09ceee8bc 100644
@@ -3,6 +3,7 @@
 CONFIG_DEFAULT_DEVICE_TREE="imx8-capricorn-cxg3"
 CONFIG_IDENT_STRING=" ##v01.06"
 
+CONFIG_ENV_SOURCE_FILE="capricorn_default"
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eth1"
include/configs/capricorn-common.h +1 -51

66 lines not on this page · raw message

Signature · 1 line
2.20.1
#3 lore raw

PATCH v2 3/5 siemens: capricorn: defconfig updates

In reply to Heiko Schocher

From: Walter Schweizer <[email protected]>

add ahab command as secure boot is used on this boards, and enable watchdog, so U-Boot triggers it.

for respelling commit subject and message:

---

Changes in v2:
- respelled commit subject and message as suggested from Fabio

 configs/imx8qxp_capricorn.config | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
configs/imx8qxp_capricorn.config +2 -1
index f59f2129d56..032cab63af8 100644
@@ -16,6 +16,7 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_MMC_ENV_PART=2
 
 CONFIG_DM_GPIO=y
+CONFIG_AHAB_BOOT=y
 
 CONFIG_TARGET_CAPRICORN=y
 CONFIG_SPL_MMC=y
@@ -129,7 +130,7 @@ CONFIG_DM_SERIAL=y
 CONFIG_FSL_LPUART=y
 CONFIG_DM_THERMAL=y
 CONFIG_IMX_SCU_THERMAL=y
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
 CONFIG_WDT=y
 CONFIG_WDT_SIEMENS_PMIC=y
 CONFIG_SPL_TINY_MEMSET=y
Signature · 1 line
2.20.1
#4 lore raw

PATCH v2 4/5 arm: imx8qxp: capricorn: move env offset settings

In reply to Heiko Schocher

move the ENV_OFFSET settings from common config settings file configs/imx8qxp_capricorn.config to defconfig file for the cxg3 board, as other imx8qxp based boards from siemens has the environment on other offsets.

---

Changes in v2:
- new patch arm: imx8qxp: capricorn: move env offset settings in v2

 configs/capricorn_cxg3_defconfig | 2 ++
 configs/imx8qxp_capricorn.config | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)
configs/capricorn_cxg3_defconfig +2 -0
index 5f09ceee8bc..5689544c1d0 100644
@@ -5,6 +5,8 @@ CONFIG_IDENT_STRING=" ##v01.06"
 
 CONFIG_ENV_SOURCE_FILE="capricorn_default"
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_ENV_OFFSET=0x200000
+CONFIG_ENV_OFFSET_REDUND=0x202000
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eth1"
 CONFIG_NET_RANDOM_ETHADDR=y
configs/imx8qxp_capricorn.config +0 -2
index 032cab63af8..463e584530f 100644
@@ -10,8 +10,6 @@ CONFIG_NR_DRAM_BANKS=3
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
 CONFIG_ENV_SIZE=0x2000
-CONFIG_ENV_OFFSET=0x200000
-CONFIG_ENV_OFFSET_REDUND=0x202000
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_MMC_ENV_PART=2
 
Signature · 1 line
2.20.1
#5 lore raw

PATCH v2 5/5 siemens: imx8qxp: remove unused config file

In reply to Heiko Schocher

include/configs/giedi.h is not longer used after siemens imx8qxp cleanup series, so remove it.

---

Changes in v2:
- patch siemens: imx8qxp: remove unused config file new in v2

 include/configs/giedi.h | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 include/configs/giedi.h
include/configs/giedi.h deleted +0 -16
deleted file mode 100644
index 19a795bcf86..00000000000
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2019 Siemens AG
- *
- */
-
-#ifndef __GIEDI_H
-#define __GIEDI_H
-
-#include "capricorn-common.h"
-
-/* DDR3 board total DDR is 1 GB */
-#undef PHYS_SDRAM_1_SIZE
-#define PHYS_SDRAM_1_SIZE		0x40000000	/* 1 GB */
-
-#endif /* __GIEDI_H */
Signature · 1 line
2.20.1
reviewer Applied
#6 lore raw
In reply to Heiko Schocher
Quoted 11 lines · Heiko Schocher

some small updates for the cxg3 board:

- collect common Kconfig options in an include file, which
makes syncing downstream defconfig files easier
- Move the U-Boot Environment setttings in a txt file
- minor defconfig updates
- remove now unused file include/configs/giedi.h
- base is now
62ea9c329a0 - (origin/master, origin/HEAD) board: starfive: visionfive2: Order board detection logic to match config

Applied, thanks.