Updates for the siemens cxg3 for 2025.07
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
- base is
407d68638fe - (origin/master, origin/HEAD) Merge patch series "Switch to using $(PHASE_) in Makefiles"
Heiko Schocher (1):
imx8qxp: capricorn defconfig: collect common Kconfig options
Walter Schweizer (2):
siemens: capricorn: enable text based default environment
siemens: capricorn: add ahab command and enable watchdog
board/siemens/capricorn/MAINTAINERS | 1 + board/siemens/capricorn/capricorn_default.env | 51 +++++++ configs/capricorn_cxg3_defconfig | 133 +---------------- configs/imx8qxp_capricorn.config | 136 ++++++++++++++++++ include/configs/capricorn-common.h | 52 +------ 5 files changed, 194 insertions(+), 179 deletions(-) create mode 100644 board/siemens/capricorn/capricorn_default.env create mode 100644 configs/imx8qxp_capricorn.config
Signature · 4 lines
2.20.1 base-commit: 407d68638fe32418d61681407effba2a303bb9ee branch: feat/capricorn-upstream-hs
PATCH 1/3 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
---
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
@@ -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
Fabio Estevam
reviewerRe: [PATCH v1 1/3] imx8qxp: capricorn defconfig: collect common Kconfig options
Hi Heiko,
Quoted 2 lines · Heiko Schocher
siemens have some defconfigs for different hardware versions,
s/siemens/Siemens
Quoted 7 lines
all based on mainline cxg3 board. For easier updating the downstream defconfigs, move common settings into new file.
configs/imx8qxp_capricorn.configSigned-off-by Heiko Schocher <[email protected]>Signed-off-by Walter Schweizer <[email protected]>
The other patches had authorship from Walter, but this one doesn't.
Just checking if this one is correct.
Quoted 313 lines
---
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.configboard/siemens/capricorn/MAINTAINERS +1
-0@@ -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.hconfigs/capricorn_cxg3_defconfig +4
-128@@ -1,117 +1,13 @@ -CONFIG_ARM=y -CONFIG_ARCH_IMX8=y -CONFIG_TEXT_BASE=0x80020000 -CONFIG_SYS_MALLOC_LEN=0x2800000 -CONFIG_SYS_MALLOC_F_LEN=0x4000 -CONFIG_SPL_GPIO=y -CONFIG_SPL_LIBCOMMON_SUPPORT=y -CONFIG_SPL_LIBGENERIC_SUPPORT=y -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_DM_GPIO=y +#include <configs/imx8qxp_capricorn.config> + CONFIG_DEFAULT_DEVICE_TREE="imx8-capricorn-cxg3" -CONFIG_TARGET_CAPRICORN=y -CONFIG_SPL_MMC=y -CONFIG_SPL_SERIAL=y -CONFIG_SPL_DRIVERS_MISC=y -CONFIG_SPL_STACK=0x13e000 -CONFIG_SPL_TEXT_BASE=0x100000 -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y -CONFIG_SPL_BSS_START_ADDR=0x128000 -CONFIG_SPL_BSS_MAX_SIZE=0x1000 -CONFIG_SYS_BOOTM_LEN=0x800000 -CONFIG_SYS_LOAD_ADDR=0x80280000 -CONFIG_SPL=y -CONFIG_ENV_OFFSET_REDUND=0x202000 CONFIG_IDENT_STRING=" ##v01.06" -CONFIG_REMAKE_ELF=y -# CONFIG_EFI_LOADER is not set -CONFIG_FIT=y -CONFIG_FIT_EXTERNAL_OFFSET=0x3000 -CONFIG_BOOTDELAY=3 -CONFIG_AUTOBOOT_KEYED=y -CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n" -CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" -CONFIG_AUTOBOOT_KEYED_CTRLC=y -CONFIG_OF_BOARD_SETUP=y -CONFIG_OF_SYSTEM_SETUP=y -CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="if usrbutton; then run flash_self_test; reset; fi;run flash_self;reset;" -CONFIG_SYS_CBSIZE=2048 -CONFIG_SYS_PBSIZE=2073 -CONFIG_LOG=y -CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_SPL_MAX_SIZE=0x1f000 -CONFIG_SPL_BOARD_INIT=y -# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -# CONFIG_SPL_LEGACY_IMAGE_FORMAT is not set -CONFIG_SPL_LOAD_IMX_CONTAINER=y -CONFIG_IMX_CONTAINER_CFG="board/siemens/capricorn/uboot-container.cfg" -CONFIG_SPL_SYS_MALLOC_SIMPLE=y -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set -CONFIG_SPL_HAVE_INIT_STACK=y -CONFIG_SPL_SYS_MALLOC=y -CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y -CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x120000 -CONFIG_SPL_SYS_MALLOC_SIZE=0x4000 -CONFIG_SPL_SYS_MMCSD_RAW_MODE=y -CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1040 -CONFIG_SPL_POWER_DOMAIN=y -CONFIG_SPL_WATCHDOG=y -CONFIG_HUSH_PARSER=y -CONFIG_SYS_PROMPT="U-Boot# " -CONFIG_CMD_CPU=y -# CONFIG_BOOTM_NETBSD is not set -# CONFIG_CMD_EXPORTENV is not set -# CONFIG_CMD_IMPORTENV is not set -# CONFIG_CMD_CRC32 is not set -CONFIG_CMD_CLK=y -CONFIG_CMD_DM=y -CONFIG_CMD_FUSE=y -CONFIG_CMD_GPIO=y -CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y -CONFIG_CMD_READ=y -CONFIG_CMD_WDT=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_SPL_OF_CONTROL=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_MMC=y -CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -CONFIG_SYS_MMC_ENV_PART=2 + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_USE_ETHPRIME=y CONFIG_ETHPRIME="eth1" CONFIG_NET_RANDOM_ETHADDR=y -CONFIG_SPL_DM=y -CONFIG_BOOTCOUNT_LIMIT=y -CONFIG_BOOTCOUNT_ENV=y -CONFIG_BOOTCOUNT_ALTBOOTCMD="run bootcmd" -CONFIG_SPL_CLK=y -CONFIG_CLK_IMX8=y -CONFIG_CPU=y -CONFIG_MXC_GPIO=y -CONFIG_DM_I2C=y -CONFIG_SYS_I2C_IMX_LPI2C=y -CONFIG_LED=y -CONFIG_LED_GPIO=y -CONFIG_MISC=y -CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_MMC_IO_VOLTAGE=y -CONFIG_MMC_UHS_SUPPORT=y -CONFIG_MMC_HS400_SUPPORT=y -CONFIG_FSL_USDHC=y -CONFIG_PHYLIB=y + CONFIG_MV88E61XX_SWITCH=y CONFIG_MV88E61XX_CPU_PORT=5 CONFIG_MV88E61XX_PHY_PORTS=0x7@@ -119,23 +15,3 @@ CONFIG_DM_ETH_PHY=y CONFIG_FEC_MXC_SHARE_MDIO=y CONFIG_FEC_MXC_MDIO_BASE=0x5B050000 CONFIG_FEC_MXC=y -CONFIG_MII=y -CONFIG_PHY=y -CONFIG_NOP_PHY=y -CONFIG_PINCTRL=y -CONFIG_SPL_PINCTRL=y -CONFIG_PINCTRL_IMX8=y -CONFIG_POWER_DOMAIN=y -CONFIG_IMX8_POWER_DOMAIN=y -CONFIG_DM_REGULATOR=y -CONFIG_DM_REGULATOR_FIXED=y -CONFIG_DM_REGULATOR_GPIO=y -CONFIG_SPL_DM_REGULATOR_GPIO=y -CONFIG_DM_SERIAL=y -CONFIG_FSL_LPUART=y -CONFIG_DM_THERMAL=y -CONFIG_IMX_SCU_THERMAL=y -# CONFIG_WATCHDOG is not set -CONFIG_WDT=y -CONFIG_WDT_SIEMENS_PMIC=y -CONFIG_SPL_TINY_MEMSET=yconfigs/imx8qxp_capricorn.config new file +135
-1@@ -0,0 +1,135 @@ +CONFIG_ARM=y +CONFIG_ARCH_IMX8=y +CONFIG_TEXT_BASE=0x80020000 +CONFIG_SYS_MALLOC_LEN=0x2800000 +CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_SPL_GPIO=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +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 + +CONFIG_DM_GPIO=y + +CONFIG_TARGET_CAPRICORN=y +CONFIG_SPL_MMC=y +CONFIG_SPL_SERIAL=y +CONFIG_SPL_DRIVERS_MISC=y +CONFIG_SPL_STACK=0x13e000 +CONFIG_SPL_TEXT_BASE=0x100000 +CONFIG_SPL_HAS_BSS_LINKER_SECTION=y +CONFIG_SPL_BSS_START_ADDR=0x128000 +CONFIG_SPL_BSS_MAX_SIZE=0x1000 +CONFIG_SYS_BOOTM_LEN=0x4000000 +CONFIG_SYS_LOAD_ADDR=0x80280000 +CONFIG_SPL=y + +CONFIG_REMAKE_ELF=y +# CONFIG_EFI_LOADER is not set +# CONFIG_ANDROID_BOOT_IMAGE is not set +CONFIG_FIT=y +CONFIG_FIT_EXTERNAL_OFFSET=0x3000 +CONFIG_BOOTDELAY=3 +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n" +CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" +CONFIG_AUTOBOOT_KEYED_CTRLC=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_OF_SYSTEM_SETUP=y +CONFIG_USE_BOOTCOMMAND=y +CONFIG_BOOTCOMMAND="if usrbutton; then run flash_self_test; reset; fi;run flash_self;reset;" +CONFIG_SYS_CBSIZE=2048 +CONFIG_SYS_PBSIZE=2073 +CONFIG_LOG=y +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SPL_MAX_SIZE=0x1f000 +CONFIG_SPL_BOARD_INIT=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +# CONFIG_SPL_LEGACY_IMAGE_FORMAT is not set +CONFIG_SPL_LOAD_IMX_CONTAINER=y +CONFIG_IMX_CONTAINER_CFG="board/siemens/capricorn/uboot-container.cfg" +CONFIG_SPL_SYS_MALLOC_SIMPLE=y +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set +CONFIG_SPL_HAVE_INIT_STACK=y +CONFIG_SPL_SYS_MALLOC=y +CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y +CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x120000 +CONFIG_SPL_SYS_MALLOC_SIZE=0x4000 +CONFIG_SPL_SYS_MMCSD_RAW_MODE=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1040 +CONFIG_SPL_POWER_DOMAIN=y +CONFIG_SPL_WATCHDOG=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot# " +CONFIG_CMD_CPU=y +# CONFIG_BOOTM_NETBSD is not set +# CONFIG_CMD_EXPORTENV is not set +# CONFIG_CMD_IMPORTENV is not set +# CONFIG_CMD_CRC32 is not set +# CONFIG_CMD_BIND is not set +CONFIG_CMD_WDT=y +CONFIG_CMD_CLK=y +CONFIG_CMD_DM=y +CONFIG_CMD_FUSE=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_READ=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MMC=y + +CONFIG_SPL_DM=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y +CONFIG_BOOTCOUNT_ALTBOOTCMD="run bootcmd" +CONFIG_SPL_CLK=y +CONFIG_CLK_IMX8=y +CONFIG_CPU=y +CONFIG_MXC_GPIO=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_IMX_LPI2C=y +CONFIG_LED=y +CONFIG_LED_GPIO=y +CONFIG_MISC=y +CONFIG_SUPPORT_EMMC_BOOT=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_MMC_UHS_SUPPORT=y +CONFIG_MMC_HS400_SUPPORT=y +CONFIG_FSL_USDHC=y +CONFIG_PHYLIB=y + +CONFIG_MII=y +CONFIG_PHY=y +CONFIG_NOP_PHY=y +CONFIG_PINCTRL=y +CONFIG_SPL_PINCTRL=y +CONFIG_PINCTRL_IMX8=y +CONFIG_POWER_DOMAIN=y +CONFIG_IMX8_POWER_DOMAIN=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_SPL_DM_REGULATOR_GPIO=y +CONFIG_DM_SERIAL=y +CONFIG_FSL_LPUART=y +CONFIG_DM_THERMAL=y +CONFIG_IMX_SCU_THERMAL=y +# CONFIG_WATCHDOG is not set +CONFIG_WDT=y +CONFIG_WDT_SIEMENS_PMIC=y +CONFIG_SPL_TINY_MEMSET=y --2.20.1
Re: [PATCH v1 1/3] imx8qxp: capricorn defconfig: collect common Kconfig options
Hello Fabio,
Quoted 7 lines · Fabio Estevam
Hi Heiko,
Quoted 2 lines · Heiko Schocher
siemens have some defconfigs for different hardware versions,
s/siemens/Siemens
Will fix.
Quoted 11 lines
Quoted 7 lines
all based on mainline cxg3 board. For easier updating the downstream defconfigs, move common settings into new file.
configs/imx8qxp_capricorn.configSigned-off-by Heiko Schocher <[email protected]>Signed-off-by Walter Schweizer <[email protected]>The other patches had authorship from Walter, but this one doesn't.
Just checking if this one is correct.
Yep, as I moved this into the new file.
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: [email protected]
RE: [PATCH v1 1/3] imx8qxp: capricorn defconfig: collect common Kconfig options
In reply to Fabio EstevamHi Fabio
Thanks for checking, it is fine.
Cheers
Walter
-----Original Message-----
From: Fabio Estevam <[email protected]>
Sent: Friday, April 25, 2025 1:46 PM
To: Schocher, Heiko (ext guest) (DENX Software Engineering GmbH) <[email protected]>
Cc: U-Boot Mailing List <[email protected]>; Schweizer, Walter (SI B PRO TI EAC CCP) <[email protected]>; Sverdlin, Alexander (SI B PRO TI EAC CCP) <[email protected]>; Anatolij Gustschin <[email protected]>; Enrico Leto <[email protected]>; Quentin Schulz <[email protected]>; Simon Glass <[email protected]>; Tom Rini <[email protected]>; Tomas Peterka <[email protected]>
Subject: Re: [PATCH v1 1/3] imx8qxp: capricorn defconfig: collect common Kconfig options
Hi Heiko,
Quoted 2 lines · Heiko Schocher
siemens have some defconfigs for different hardware versions,
s/siemens/Siemens
Quoted 7 lines
all based on mainline cxg3 board. For easier updating the downstream defconfigs, move common settings into new file.
configs/imx8qxp_capricorn.configSigned-off-by Heiko Schocher <[email protected]>Signed-off-by Walter Schweizer <[email protected]>
The other patches had authorship from Walter, but this one doesn't.
Just checking if this one is correct.
Quoted 312 lines
---
board/siemens/capricorn/MAINTAINERS | 1 + configs/capricorn_cxg3_defconfig | 132 +-------------------------- configs/imx8qxp_capricorn.config | 135 ++++++++++++++++++++++++++++ 3 files changed, 140 insertions(+), 128 deletions(-) create mode100644
configs/imx8qxp_capricorn.configboard/siemens/capricorn/MAINTAINERS +1
-0@@ -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.hconfigs/capricorn_cxg3_defconfig +2
-47@@ -1,117 +1,13 @@ -CONFIG_ARM=y -CONFIG_ARCH_IMX8=y -CONFIG_TEXT_BASE=0x80020000 -CONFIG_SYS_MALLOC_LEN=0x2800000 -CONFIG_SYS_MALLOC_F_LEN=0x4000 -CONFIG_SPL_GPIO=y -CONFIG_SPL_LIBCOMMON_SUPPORT=y -CONFIG_SPL_LIBGENERIC_SUPPORT=y -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_DM_GPIO=y +#include <configs/imx8qxp_capricorn.config> + CONFIG_DEFAULT_DEVICE_TREE="imx8-capricorn-cxg3" -CONFIG_TARGET_CAPRICORN=y -CONFIG_SPL_MMC=y -CONFIG_SPL_SERIAL=y -CONFIG_SPL_DRIVERS_MISC=y -CONFIG_SPL_STACK=0x13e000 -CONFIG_SPL_TEXT_BASE=0x100000 -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y -CONFIG_SPL_BSS_START_ADDR=0x128000 -CONFIG_SPL_BSS_MAX_SIZE=0x1000 -CONFIG_SYS_BOOTM_LEN=0x800000 -CONFIG_SYS_LOAD_ADDR=0x80280000 -CONFIG_SPL=y -CONFIG_ENV_OFFSET_REDUND=0x202000 CONFIG_IDENT_STRING=" ##v01.06" -CONFIG_REMAKE_ELF=y -# CONFIG_EFI_LOADER is not set -CONFIG_FIT=y -CONFIG_FIT_EXTERNAL_OFFSET=0x3000 -CONFIG_BOOTDELAY=3 -CONFIG_AUTOBOOT_KEYED=y -CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n" -CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" -CONFIG_AUTOBOOT_KEYED_CTRLC=y -CONFIG_OF_BOARD_SETUP=y -CONFIG_OF_SYSTEM_SETUP=y -CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="if usrbutton; then run flash_self_test; reset; fi;run flash_self;reset;" -CONFIG_SYS_CBSIZE=2048 -CONFIG_SYS_PBSIZE=2073 -CONFIG_LOG=y -CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_SPL_MAX_SIZE=0x1f000 -CONFIG_SPL_BOARD_INIT=y -# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -#
CONFIG_SPL_LEGACY_IMAGE_FORMATis not setconfigs/capricorn_cxg3_defconfig +2
-79-CONFIG_SPL_LOAD_IMX_CONTAINER=y -CONFIG_IMX_CONTAINER_CFG="board/siemens/capricorn/uboot-container.cfg" -CONFIG_SPL_SYS_MALLOC_SIMPLE=y -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set -CONFIG_SPL_HAVE_INIT_STACK=y -CONFIG_SPL_SYS_MALLOC=y -CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y -CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x120000 -CONFIG_SPL_SYS_MALLOC_SIZE=0x4000 -CONFIG_SPL_SYS_MMCSD_RAW_MODE=y -CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1040 -CONFIG_SPL_POWER_DOMAIN=y -CONFIG_SPL_WATCHDOG=y -CONFIG_HUSH_PARSER=y -CONFIG_SYS_PROMPT="U-Boot# " -CONFIG_CMD_CPU=y -# CONFIG_BOOTM_NETBSD is not set -# CONFIG_CMD_EXPORTENV is not set -# CONFIG_CMD_IMPORTENV is not set -# CONFIG_CMD_CRC32 is not set -CONFIG_CMD_CLK=y -CONFIG_CMD_DM=y -CONFIG_CMD_FUSE=y -CONFIG_CMD_GPIO=y -CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y -CONFIG_CMD_READ=y -CONFIG_CMD_WDT=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_SPL_OF_CONTROL=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_MMC=y -CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -CONFIG_SYS_MMC_ENV_PART=2 + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_USE_ETHPRIME=y CONFIG_ETHPRIME="eth1" CONFIG_NET_RANDOM_ETHADDR=y -CONFIG_SPL_DM=y -CONFIG_BOOTCOUNT_LIMIT=y -CONFIG_BOOTCOUNT_ENV=y -CONFIG_BOOTCOUNT_ALTBOOTCMD="run bootcmd" -CONFIG_SPL_CLK=y -CONFIG_CLK_IMX8=y -CONFIG_CPU=y -CONFIG_MXC_GPIO=y -CONFIG_DM_I2C=y -CONFIG_SYS_I2C_IMX_LPI2C=y -CONFIG_LED=y -CONFIG_LED_GPIO=y -CONFIG_MISC=y -CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_MMC_IO_VOLTAGE=y -CONFIG_MMC_UHS_SUPPORT=y -CONFIG_MMC_HS400_SUPPORT=y -CONFIG_FSL_USDHC=y -CONFIG_PHYLIB=y + CONFIG_MV88E61XX_SWITCH=y CONFIG_MV88E61XX_CPU_PORT=5 CONFIG_MV88E61XX_PHY_PORTS=0x7@@ -119,23 +15,3 @@ CONFIG_DM_ETH_PHY=y CONFIG_FEC_MXC_SHARE_MDIO=y CONFIG_FEC_MXC_MDIO_BASE=0x5B050000 CONFIG_FEC_MXC=y -CONFIG_MII=y -CONFIG_PHY=y -CONFIG_NOP_PHY=y -CONFIG_PINCTRL=y -CONFIG_SPL_PINCTRL=y -CONFIG_PINCTRL_IMX8=y -CONFIG_POWER_DOMAIN=y -CONFIG_IMX8_POWER_DOMAIN=y -CONFIG_DM_REGULATOR=y -CONFIG_DM_REGULATOR_FIXED=y -CONFIG_DM_REGULATOR_GPIO=y -CONFIG_SPL_DM_REGULATOR_GPIO=y -CONFIG_DM_SERIAL=y -CONFIG_FSL_LPUART=y -CONFIG_DM_THERMAL=y -CONFIG_IMX_SCU_THERMAL=y -# CONFIG_WATCHDOG is not set -CONFIG_WDT=y -CONFIG_WDT_SIEMENS_PMIC=y -CONFIG_SPL_TINY_MEMSET=yconfigs/imx8qxp_capricorn.config new file +133
-1@@ -0,0 +1,135 @@ +CONFIG_ARM=y +CONFIG_ARCH_IMX8=y +CONFIG_TEXT_BASE=0x80020000 +CONFIG_SYS_MALLOC_LEN=0x2800000 +CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_SPL_GPIO=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +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 + +CONFIG_DM_GPIO=y + +CONFIG_TARGET_CAPRICORN=y +CONFIG_SPL_MMC=y +CONFIG_SPL_SERIAL=y +CONFIG_SPL_DRIVERS_MISC=y +CONFIG_SPL_STACK=0x13e000 +CONFIG_SPL_TEXT_BASE=0x100000 +CONFIG_SPL_HAS_BSS_LINKER_SECTION=y +CONFIG_SPL_BSS_START_ADDR=0x128000 +CONFIG_SPL_BSS_MAX_SIZE=0x1000 +CONFIG_SYS_BOOTM_LEN=0x4000000 +CONFIG_SYS_LOAD_ADDR=0x80280000 +CONFIG_SPL=y + +CONFIG_REMAKE_ELF=y +# CONFIG_EFI_LOADER is not set +# CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_FIT=y +CONFIG_FIT_EXTERNAL_OFFSET=0x3000 +CONFIG_BOOTDELAY=3 +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n" +CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" +CONFIG_AUTOBOOT_KEYED_CTRLC=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_OF_SYSTEM_SETUP=y +CONFIG_USE_BOOTCOMMAND=y +CONFIG_BOOTCOMMAND="if usrbutton; then run flash_self_test; reset; fi;run flash_self;reset;" +CONFIG_SYS_CBSIZE=2048 +CONFIG_SYS_PBSIZE=2073 +CONFIG_LOG=y +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SPL_MAX_SIZE=0x1f000 +CONFIG_SPL_BOARD_INIT=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set # +CONFIG_SPL_LEGACY_IMAGE_FORMAT is not set +CONFIG_SPL_LOAD_IMX_CONTAINER=y +CONFIG_IMX_CONTAINER_CFG="board/siemens/capricorn/uboot-container.cfg" +CONFIG_SPL_SYS_MALLOC_SIMPLE=y +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set +CONFIG_SPL_HAVE_INIT_STACK=y CONFIG_SPL_SYS_MALLOC=y +CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y +CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x120000 +CONFIG_SPL_SYS_MALLOC_SIZE=0x4000 +CONFIG_SPL_SYS_MMCSD_RAW_MODE=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1040 +CONFIG_SPL_POWER_DOMAIN=y +CONFIG_SPL_WATCHDOG=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="U-Boot# " +CONFIG_CMD_CPU=y +# CONFIG_BOOTM_NETBSD is not set +# CONFIG_CMD_EXPORTENV is not set +# CONFIG_CMD_IMPORTENV is not set +# CONFIG_CMD_CRC32 is not set +# CONFIG_CMD_BIND is not set +CONFIG_CMD_WDT=y +CONFIG_CMD_CLK=y +CONFIG_CMD_DM=y +CONFIG_CMD_FUSE=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_READ=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MMC=y + +CONFIG_SPL_DM=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y +CONFIG_BOOTCOUNT_ALTBOOTCMD="run bootcmd" +CONFIG_SPL_CLK=y +CONFIG_CLK_IMX8=y +CONFIG_CPU=y +CONFIG_MXC_GPIO=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_IMX_LPI2C=y +CONFIG_LED=y +CONFIG_LED_GPIO=y +CONFIG_MISC=y +CONFIG_SUPPORT_EMMC_BOOT=y +CONFIG_MMC_IO_VOLTAGE=y +CONFIG_MMC_UHS_SUPPORT=y +CONFIG_MMC_HS400_SUPPORT=y +CONFIG_FSL_USDHC=y +CONFIG_PHYLIB=y + +CONFIG_MII=y +CONFIG_PHY=y +CONFIG_NOP_PHY=y +CONFIG_PINCTRL=y +CONFIG_SPL_PINCTRL=y +CONFIG_PINCTRL_IMX8=y +CONFIG_POWER_DOMAIN=y +CONFIG_IMX8_POWER_DOMAIN=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_SPL_DM_REGULATOR_GPIO=y +CONFIG_DM_SERIAL=y +CONFIG_FSL_LPUART=y +CONFIG_DM_THERMAL=y +CONFIG_IMX_SCU_THERMAL=y +# CONFIG_WATCHDOG is not set +CONFIG_WDT=y +CONFIG_WDT_SIEMENS_PMIC=y +CONFIG_SPL_TINY_MEMSET=y --2.20.1
PATCH 2/3 siemens: capricorn: enable text based default environment
In reply to Heiko SchocherFrom: 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
---
board/siemens/capricorn/capricorn_default.env | 51 ++++++++++++++++++ configs/capricorn_cxg3_defconfig | 1 + include/configs/capricorn-common.h | 52 +------------------ 3 files changed, 53 insertions(+), 51 deletions(-) create mode 100644 board/siemens/capricorn/capricorn_default.env
board/siemens/capricorn/capricorn_default.env new file +51 -0
@@ -0,0 +1,51 @@ +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 +ipaddr=192.168.251.1 +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 +serverip=192.168.251.2 +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
@@ -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
Fabio Estevam
reviewerRe: [PATCH v1 2/3] siemens: capricorn: enable text based default environment
Hi Heiko,
board/siemens/capricorn/capricorn_default.env line 20
Quoted 3 lines · Heiko Schocher
board/siemens/capricorn/capricorn_default.env new file +3
-0+initrd_addr=0x83100000 +initrd_high=0xffffffffffffffff +ipaddr=192.168.251.1
Please don't hardcode the IP address.
Re: [PATCH v1 2/3] siemens: capricorn: enable text based default environment
Hello Fabio,
Quoted 10 lines · Fabio Estevam
Hi Heiko,
board/siemens/capricorn/capricorn_default.env line 20
Quoted 3 lines · Heiko Schocher
board/siemens/capricorn/capricorn_default.env new file +3
-0+initrd_addr=0x83100000 +initrd_high=0xffffffffffffffff +ipaddr=192.168.251.1Please don't hardcode the IP address.
yep, of course, will remove it.
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: [email protected]
PATCH 3/3 siemens: capricorn: add ahab command and enable watchdog
In reply to Heiko SchocherFrom: Walter Schweizer <[email protected]>
Handle watchdog in U-Boot to fix CI.
---
configs/imx8qxp_capricorn.config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
configs/imx8qxp_capricorn.config +2 -1
@@ -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
Fabio Estevam
reviewerRe: [PATCH v1 3/3] siemens: capricorn: add ahab command and enable watchdog
Hi Heiko,
Quoted 4 lines · Heiko Schocher
From: Walter Schweizer <[email protected]>
Handle watchdog in U-Boot to fix CI.
This commit log must be improved.
The watchdog's purpose inside the imx8qxp is not to make CI happy :-)
configs/imx8qxp_capricorn.config CONFIG_SYS_REDUNDAND_ENVIRONMENT=y · line 19
Quoted 5 lines
configs/imx8qxp_capricorn.config +1
-0@@ -16,6 +16,7 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_MMC_ENV_PART=2 CONFIG_DM_GPIO=y +CONFIG_AHAB_BOOT=y
What do you think about this option? It seems unrelated to watchdog.
Re: [PATCH v1 3/3] siemens: capricorn: add ahab command and enable watchdog
Hello Fabio,
Quoted 9 lines · Fabio Estevam
Hi Heiko,
Quoted 4 lines · Heiko Schocher
From: Walter Schweizer <[email protected]>
Handle watchdog in U-Boot to fix CI.
This commit log must be improved.
Indeed!
Quoted 1 line
The watchdog's purpose inside the imx8qxp is not to make CI happy :-)
:-P
Quoted 8 lines
configs/imx8qxp_capricorn.config CONFIG_SYS_REDUNDAND_ENVIRONMENT=y · line 19
Quoted 6 lines
configs/imx8qxp_capricorn.config +1
-0@@ -16,6 +16,7 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_MMC_ENV_PART=2 CONFIG_DM_GPIO=y +CONFIG_AHAB_BOOT=yWhat do you think about this option? It seems unrelated to watchdog.
Yep, as in subject the patch enables AHAB and WATCHDOG...
I will improve the commit message.
Thanks for the review!
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: [email protected]