* [DistroKit] [PATCH v2 0/3] Update barebox to newest version
@ 2025-12-02 17:03 Fabian Pflug
2025-12-02 17:03 ` [DistroKit] [PATCH v2 1/3] v7a: barebox: version bump 2025.06.1 -> 2025.11.0 Fabian Pflug
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Fabian Pflug @ 2025-12-02 17:03 UTC (permalink / raw)
To: distrokit; +Cc: Fabian Pflug
Updating barebox for the most used platforms to the newest version.
Signed-off-by: Fabian Pflug <f.pflug@pengutronix.de>
---
Changes in v2:
- Remove old patches
- Add patch to fix i.MX93 regression
- Link to v1: https://lore.distrokit.org/distrokit/20251202112849.2046517-1-f.pflug@pengutronix.de/T/#t
---
Fabian Pflug (3):
v7a: barebox: version bump 2025.06.1 -> 2025.11.0
v7a_noneon: barebox: version bump 2025.03.0 -> 2025.11.0
v8a: barebox: version bump 2025.07.0 -> 2025.11.0
configs/platform-v7a/barebox-am335x-mlo.config | 158 +-
configs/platform-v7a/barebox-at91.config | 213 +-
configs/platform-v7a/barebox-at91.config.diff | 8 +-
configs/platform-v7a/barebox-common.config | 208 +-
configs/platform-v7a/barebox.config | 220 +-
configs/platform-v7a/platformconfig | 8 +-
configs/platform-v7a_noneon/barebox-at91.config | 242 +-
.../platform-v7a_noneon/barebox-at91.config.diff | 8 +-
configs/platform-v7a_noneon/barebox-common.config | 241 +-
.../platform-v7a_noneon/barebox-vexpress.config | 241 +-
.../barebox-vexpress.config.diff | 4 +-
...dd-sama5d3-compatible-after-DT-regression.patch | 41 -
.../patches/barebox-2025.03.0/series | 1 -
configs/platform-v7a_noneon/platformconfig | 4 +-
configs/platform-v8a/barebox.config | 166 +-
...on-deep-probe-include-of-for-of_device_id.patch | 30 -
...boards-i.MX93-Add-NXP-FRDM-i.MX93-support.patch | 2624 --------------------
.../platform-v8a/patches/barebox-2025.07.0/series | 2 -
.../0001-ARM-i-MX93-reinstate-aliases.patch | 62 +
.../platform-v8a/patches/barebox-2025.11.0/series | 1 +
configs/platform-v8a/platformconfig | 4 +-
...-vexpress-increase-barebox-partition-size.patch | 74 -
patches/barebox-2025.06.1/series | 4 -
23 files changed, 1126 insertions(+), 3438 deletions(-)
---
base-commit: be001f7cd0b7a1387aea136b6e60587194c1b562
change-id: 20251202-fpg-barebox_update-9919516e5ff6
Best regards,
--
Fabian Pflug <f.pflug@pengutronix.de>
^ permalink raw reply [flat|nested] 5+ messages in thread* [DistroKit] [PATCH v2 1/3] v7a: barebox: version bump 2025.06.1 -> 2025.11.0 2025-12-02 17:03 [DistroKit] [PATCH v2 0/3] Update barebox to newest version Fabian Pflug @ 2025-12-02 17:03 ` Fabian Pflug 2025-12-02 17:03 ` [DistroKit] [PATCH v2 2/3] v7a_noneon: barebox: version bump 2025.03.0 " Fabian Pflug ` (2 subsequent siblings) 3 siblings, 0 replies; 5+ messages in thread From: Fabian Pflug @ 2025-12-02 17:03 UTC (permalink / raw) To: distrokit; +Cc: Fabian Pflug Updating barebox to a current version. Run oldconfig and accepting all the defaults, except for BOOTM_OFTREE_FALLBACK, where the recommended n is selected. Signed-off-by: Fabian Pflug <f.pflug@pengutronix.de> --- configs/platform-v7a/barebox-am335x-mlo.config | 158 +++++++++------ configs/platform-v7a/barebox-at91.config | 213 ++++++++++++-------- configs/platform-v7a/barebox-at91.config.diff | 8 +- configs/platform-v7a/barebox-common.config | 208 +++++++++++-------- configs/platform-v7a/barebox.config | 220 +++++++++++++-------- configs/platform-v7a/platformconfig | 8 +- ...-vexpress-increase-barebox-partition-size.patch | 74 ------- patches/barebox-2025.06.1/series | 4 - 8 files changed, 502 insertions(+), 391 deletions(-) diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config index 80c8955..3815586 100644 --- a/configs/platform-v7a/barebox-am335x-mlo.config +++ b/configs/platform-v7a/barebox-am335x-mlo.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2025.06.1 Configuration +# Barebox/arm 2025.11.0 Configuration # CONFIG_ARM=y CONFIG_ARCH_LINUX_NAME="arm" @@ -28,6 +28,7 @@ CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_LAYERSCAPE is not set CONFIG_ARCH_OMAP_MULTI=y # CONFIG_ARCH_ROCKCHIP is not set +# CONFIG_ARCH_SAMSUNG is not set # CONFIG_ARCH_STM32MP is not set # CONFIG_ARCH_VERSATILE is not set # CONFIG_ARCH_VEXPRESS is not set @@ -74,7 +75,9 @@ CONFIG_32BIT=y # # CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS is not set CONFIG_ARM_EXCEPTIONS=y +# CONFIG_ARM_EXCEPTIONS_PBL is not set # CONFIG_ARM_UNWIND is not set +CONFIG_ARM_MMU_PERMISSIONS=y # CONFIG_ARM_SEMIHOSTING is not set # CONFIG_ARM_PSCI_CLIENT is not set # end of ARM specific settings @@ -85,9 +88,11 @@ CONFIG_ARM_EXCEPTIONS=y # CONFIG_BOARD_GENERIC_DT is not set # end of General architecture-dependent options +CONFIG_ARCH_HAS_DMA_WRITE_COMBINE=y CONFIG_ARCH_HAS_DATA_ABORT_MASK=y CONFIG_ARCH_HAS_ZERO_PAGE=y CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y +CONFIG_HAVE_ARCH_BOOTM_OFTREE=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_ARCH_HAS_SJLJ=y CONFIG_HAS_DEBUG_LL=y @@ -105,10 +110,9 @@ CONFIG_FILETYPE=y # # General Settings # +CONFIG_NAME="" CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y -CONFIG_HAS_INSECURE_DEFAULTS=y -CONFIG_INSECURE=y CONFIG_BANNER=y # CONFIG_MEMINFO is not set # CONFIG_ENVIRONMENT_VARIABLES is not set @@ -137,11 +141,11 @@ CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff CONFIG_STACK_SIZE=0x8000 CONFIG_MALLOC_SIZE=0x0 +CONFIG_SCRATCH_SIZE=0x8000 CONFIG_MALLOC_ALIGNMENT=8 # end of memory layout # CONFIG_EXPERIMENTAL is not set -# CONFIG_MALLOC_DLMALLOC is not set CONFIG_MALLOC_TLSF=y # CONFIG_MALLOC_DUMMY is not set # CONFIG_KALLSYMS is not set @@ -149,6 +153,7 @@ CONFIG_RELOCATABLE=y # CONFIG_PANIC_POWEROFF is not set # CONFIG_PANIC_HANG is not set CONFIG_PANIC_RESET=y +# CONFIG_PANIC_TRAP is not set CONFIG_PROMPT="MLO>" CONFIG_BAUDRATE=115200 CONFIG_SIMPLE_READLINE=y @@ -157,7 +162,6 @@ CONFIG_CBSIZE=1024 # CONFIG_SHELL_SIMPLE is not set CONFIG_SHELL_NONE=y # CONFIG_GLOB is not set -# CONFIG_PASSWORD is not set # CONFIG_ERRNO_MESSAGES is not set # CONFIG_BOOTM is not set # CONFIG_BAREBOX_UPDATE is not set @@ -181,17 +185,13 @@ CONFIG_PARTITION_DISK_DOS=y CONFIG_DEFAULT_COMPRESSION_NONE=y # CONFIG_POLLER is not set # CONFIG_BTHREAD is not set +# CONFIG_TLV is not set # CONFIG_STATE is not set # CONFIG_BOOTCHOOSER is not set # CONFIG_BOOT_DEFAULTS is not set # CONFIG_BAREBOX_DT_2ND is not set CONFIG_EXTERNAL_DTS_FRAGMENTS="" - -# -# OP-TEE loading -# CONFIG_FILETYPE_STRINGS=y -# end of OP-TEE loading # end of General Settings # @@ -230,6 +230,7 @@ CONFIG_HAVE_EFI_STUB=y # # Drivers # +# CONFIG_DEEP_PROBE_DEFAULT is not set CONFIG_OFTREE=y CONFIG_OFTREE_MEM_GENERIC=y CONFIG_DTC=y @@ -265,6 +266,7 @@ CONFIG_DRIVER_SPI_OMAP3=y # CONFIG_MTD is not set CONFIG_DISK=y # CONFIG_DISK_WRITE is not set +# CONFIG_DM_BLK is not set # # drive types @@ -287,6 +289,8 @@ CONFIG_MCI=y # --- Feature list --- # # CONFIG_MCI_TUNING is not set +CONFIG_MCI_STARTUP_NONE=y +# CONFIG_MCI_STARTUP_NONREMOVABLE is not set # CONFIG_MCI_STARTUP is not set # CONFIG_MCI_WRITE is not set # CONFIG_MCI_MMC_BOOT_PARTITIONS is not set @@ -304,6 +308,7 @@ CONFIG_MCI_OMAP_HSMMC=y # CONFIG_MCI_ARASAN is not set # CONFIG_MCI_AM654 is not set # CONFIG_MCI_SPI is not set +# CONFIG_MMC_CADENCE_SDHCI is not set CONFIG_MCI_OMAP_HSMMC_PBL=y # CONFIG_COMMON_CLK is not set @@ -402,6 +407,15 @@ CONFIG_TI_SYSC=y # end of Remoteproc drivers # CONFIG_RESET_CONTROLLER is not set +CONFIG_HW_HAS_PCI=y + +# +# PCI bus options +# +# CONFIG_PCI is not set +# CONFIG_PCI_ECAM_GENERIC is not set +# end of PCI bus options + # CONFIG_RTC_CLASS is not set # @@ -519,8 +533,80 @@ CONFIG_FS_FAT_LFN=y # # ZSTD support disabled # +# CONFIG_FS_QEMU_FW_CFG is not set # end of Filesystem support +# +# Security options +# +CONFIG_INSECURE=y +# CONFIG_SECURITY_POLICY is not set +# CONFIG_PASSWORD is not set +# CONFIG_CRYPTO_KEYSTORE is not set +# CONFIG_BLOBGEN is not set + +# +# OP-TEE loading +# +# CONFIG_PBL_OPTEE is not set +# end of OP-TEE loading + +# +# Hardening options +# +# CONFIG_BUG_ON_DATA_CORRUPTION is not set + +# +# Memory initialization +# +CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y +# CONFIG_INIT_STACK_NONE is not set +# CONFIG_INIT_STACK_ALL_PATTERN is not set +CONFIG_INIT_STACK_ALL_ZERO=y +# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set +CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y +# CONFIG_ZERO_CALL_USED_REGS is not set +# end of Memory initialization + +# +# Buffer overflow protection +# +# CONFIG_STACK_GUARD_PAGE is not set +CONFIG_STACKPROTECTOR_NONE=y +# CONFIG_STACKPROTECTOR_STRONG is not set +CONFIG_PBL_STACKPROTECTOR_NONE=y +# CONFIG_PBL_STACKPROTECTOR_STRONG is not set +# end of Buffer overflow protection +# end of Hardening options + +CONFIG_HAS_INSECURE_DEFAULTS=y + +# +# This barebox configuration has CONFIG_HAS_INSECURE_DEFAULTS=y indicating +# + +# +# that some of the configured options have potentially insecure defaults. +# + +# +# Extra care needs to be taken in secure booted systems. +# +# end of Security options + +# +# Crypto support +# +CONFIG_CRC_ITU_T=y +# CONFIG_DIGEST is not set +# CONFIG_CRYPTO_RSA is not set +# CONFIG_CRYPTO_ECDSA is not set +# CONFIG_CRYPTO_BUILTIN_KEYS is not set +# end of Crypto support + # # Library routines # @@ -543,6 +629,7 @@ CONFIG_XYMODEM=y # CONFIG_ALLOW_PRNG_FALLBACK is not set # CONFIG_CRC_CCITT is not set # CONFIG_CRC8 is not set +# CONFIG_CRC16 is not set # # Library gui routines @@ -551,59 +638,8 @@ CONFIG_XYMODEM=y # CONFIG_BOOTSTRAP is not set # CONFIG_NLS is not set -# CONFIG_BLOBGEN is not set # end of Library routines -# -# Hardening options -# - -# -# This barebox configuration has CONFIG_HAS_INSECURE_DEFAULTS=y indicating -# - -# -# that some of the configured options have potentially insecure defaults. -# - -# -# Extra care needs to be taken in secure booted systems. -# -# CONFIG_BUG_ON_DATA_CORRUPTION is not set - -# -# Memory initialization -# -CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y -# CONFIG_INIT_STACK_NONE is not set -# CONFIG_INIT_STACK_ALL_PATTERN is not set -CONFIG_INIT_STACK_ALL_ZERO=y -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set -# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set -CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y -# CONFIG_ZERO_CALL_USED_REGS is not set -# end of Memory initialization - -# CONFIG_STACK_GUARD_PAGE is not set -CONFIG_STACKPROTECTOR_NONE=y -# CONFIG_STACKPROTECTOR_STRONG is not set -CONFIG_PBL_STACKPROTECTOR_NONE=y -# CONFIG_PBL_STACKPROTECTOR_STRONG is not set -# end of Hardening options - -# -# Crypto support -# -CONFIG_CRC_ITU_T=y -# CONFIG_DIGEST is not set -# CONFIG_CRYPTO_RSA is not set -# CONFIG_CRYPTO_ECDSA is not set -# CONFIG_CRYPTO_BUILTIN_KEYS is not set -# CONFIG_CRYPTO_KEYSTORE is not set -# end of Crypto support - # # Firmware files # diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config index fc854ed..90557fb 100644 --- a/configs/platform-v7a/barebox-at91.config +++ b/configs/platform-v7a/barebox-at91.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2025.06.1 Configuration +# Barebox/arm 2025.11.0 Configuration # CONFIG_ARM=y CONFIG_ARCH_LINUX_NAME="arm" @@ -76,7 +76,6 @@ CONFIG_MACH_SAMA5D4_WIFX=y # CONFIG_BOARD_ARM_GENERIC_DT=y CONFIG_AEABI=y -# CONFIG_ARM_BOARD_APPEND_ATAG is not set # end of System Type # CONFIG_64BIT is not set @@ -87,9 +86,12 @@ CONFIG_32BIT=y # CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_EXCEPTIONS=y +# CONFIG_ARM_EXCEPTIONS_PBL is not set CONFIG_ARM_UNWIND=y +CONFIG_ARM_MMU_PERMISSIONS=y # CONFIG_ARM_SEMIHOSTING is not set # CONFIG_ARM_PSCI_CLIENT is not set +# CONFIG_BOOT_ATAGS is not set # CONFIG_ARM_BOOTM_ELF is not set # CONFIG_ARM_BOOTM_FIP is not set # end of ARM specific settings @@ -101,10 +103,12 @@ CONFIG_BOARD_GENERIC_DT=y # CONFIG_BOARD_GENERIC_FIT is not set # end of General architecture-dependent options +CONFIG_ARCH_HAS_DMA_WRITE_COMBINE=y CONFIG_ARCH_HAS_STACK_DUMP=y CONFIG_ARCH_HAS_DATA_ABORT_MASK=y CONFIG_ARCH_HAS_ZERO_PAGE=y CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y +CONFIG_HAVE_ARCH_BOOTM_OFTREE=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_ARCH_HAS_SJLJ=y CONFIG_HAS_DEBUG_LL=y @@ -135,10 +139,9 @@ CONFIG_FASTBOOT_BASE=y # # General Settings # +CONFIG_NAME="" CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y -CONFIG_HAS_INSECURE_DEFAULTS=y -CONFIG_INSECURE=y CONFIG_BANNER=y CONFIG_MEMINFO=y CONFIG_MEMTEST=y @@ -169,17 +172,18 @@ CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff CONFIG_STACK_SIZE=0x8000 CONFIG_MALLOC_SIZE=0x0 +CONFIG_SCRATCH_SIZE=0x8000 CONFIG_MALLOC_ALIGNMENT=8 # end of memory layout # CONFIG_EXPERIMENTAL is not set -# CONFIG_MALLOC_DLMALLOC is not set CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y CONFIG_RELOCATABLE=y # CONFIG_PANIC_POWEROFF is not set # CONFIG_PANIC_HANG is not set CONFIG_PANIC_RESET=y +# CONFIG_PANIC_TRAP is not set CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=115200 CONFIG_CBSIZE=1024 @@ -194,7 +198,6 @@ CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y -# CONFIG_PASSWORD is not set CONFIG_ERRNO_MESSAGES=y CONFIG_TIMESTAMP=y CONFIG_BOOTM=y @@ -203,6 +206,7 @@ CONFIG_BOOTM_SHOW_TYPE=y CONFIG_BOOTM_VERBOSE=y CONFIG_BOOTM_INITRD=y CONFIG_BOOTM_OFTREE=y +# CONFIG_BOOTM_OFTREE_FALLBACK is not set CONFIG_BOOTM_UIMAGE=y CONFIG_BOOTM_OFTREE_UIMAGE=y # CONFIG_BOOTM_AIMAGE is not set @@ -243,7 +247,9 @@ CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" CONFIG_HAS_SCHED=y CONFIG_POLLER=y +CONFIG_POLLER_WARN_OVERTIME=y CONFIG_BTHREAD=y +# CONFIG_TLV is not set CONFIG_STATE=y # CONFIG_STATE_CRYPTO is not set # CONFIG_STATE_BACKWARD_COMPATIBLE is not set @@ -252,16 +258,10 @@ CONFIG_BOOT_DEFAULTS=y CONFIG_BAREBOX_DT_2ND=y CONFIG_RESET_SOURCE=y # CONFIG_MACHINE_ID is not set +# CONFIG_SERIAL_NUMBER_FIXUP_SYSTEMD_HOSTNAME is not set # CONFIG_SYSTEMD_OF_WATCHDOG is not set CONFIG_EXTERNAL_DTS_FRAGMENTS="${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi" - -# -# OP-TEE loading -# -# CONFIG_BOOTM_OPTEE is not set -# CONFIG_PBL_OPTEE is not set CONFIG_FILETYPE_STRINGS=y -# end of OP-TEE loading # # Android Fastboot @@ -333,6 +333,7 @@ CONFIG_CMD_REGULATOR=y # CONFIG_CMD_NVMEM is not set # CONFIG_CMD_VARINFO is not set CONFIG_CMD_VERSION=y +# CONFIG_CMD_BFETCH is not set # CONFIG_CMD_MMC is not set # CONFIG_CMD_MMC_EXTCSD is not set # CONFIG_CMD_POLLER is not set @@ -373,6 +374,7 @@ CONFIG_CMD_UMOUNT=y # # Environment # +# CONFIG_CMD_CREATENV is not set CONFIG_CMD_NV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_DEFAULTENV=y @@ -450,7 +452,6 @@ CONFIG_CMD_CLEAR=y CONFIG_CMD_ECHO=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_EDIT=y -# CONFIG_CMD_LOGIN is not set CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y CONFIG_CMD_MENUTREE=y @@ -495,12 +496,18 @@ CONFIG_CMD_WD=y CONFIG_CMD_WD_DEFAULT_TIMOUT=0 # end of Hardware manipulation +# +# Security +# +# CONFIG_CMD_BLOBGEN is not set +# CONFIG_CMD_LOGIN is not set +# end of Security + # # Miscellaneous # # CONFIG_CMD_2048 is not set CONFIG_CMD_BAREBOX_UPDATE=y -# CONFIG_CMD_BLOBGEN is not set # CONFIG_CMD_FIRMWARELOAD is not set # CONFIG_CMD_KALLSYMS is not set CONFIG_CMD_OF_COMPATIBLE=y @@ -530,10 +537,12 @@ CONFIG_NET_IFUP=y CONFIG_NET_DHCP=y # CONFIG_NET_SNTP is not set CONFIG_NET_FASTBOOT=y +# CONFIG_NET_9P is not set # # Drivers # +# CONFIG_DEEP_PROBE_DEFAULT is not set CONFIG_OFTREE=y CONFIG_OFTREE_MEM_GENERIC=y CONFIG_DTC=y @@ -584,6 +593,7 @@ CONFIG_DRIVER_NET_MICREL=y # # MII PHY device drivers # +# CONFIG_ADIN_PHY is not set # CONFIG_AR8327N_PHY is not set # CONFIG_AT803X_PHY is not set # CONFIG_DAVICOM_PHY is not set @@ -697,6 +707,7 @@ CONFIG_MTD_UBI_FASTMAP=y # CONFIG_MTD_UBI_GENERAL_EXTRA_CHECKS is not set CONFIG_DISK=y CONFIG_DISK_WRITE=y +# CONFIG_DM_BLK is not set # # drive types @@ -733,6 +744,8 @@ CONFIG_MCI=y # --- Feature list --- # # CONFIG_MCI_TUNING is not set +CONFIG_MCI_STARTUP_NONE=y +# CONFIG_MCI_STARTUP_NONREMOVABLE is not set # CONFIG_MCI_STARTUP is not set CONFIG_MCI_INFO=y CONFIG_MCI_WRITE=y @@ -754,6 +767,7 @@ CONFIG_MCI_ATMEL_SDHCI=y # CONFIG_MCI_ARASAN is not set # CONFIG_MCI_AM654 is not set # CONFIG_MCI_SPI is not set +# CONFIG_MMC_CADENCE_SDHCI is not set CONFIG_MCI_ATMEL_SDHCI_PBL=y CONFIG_HAVE_CLK=y CONFIG_CLKDEV_LOOKUP=y @@ -875,9 +889,15 @@ CONFIG_PINCTRL_AT91PIO4=y # end of Pin controllers CONFIG_NVMEM=y +CONFIG_NVMEM_LAYOUTS=y + +# +# Layout Types +# # CONFIG_NVMEM_RMEM is not set # CONFIG_NVMEM_SNVS_LPGPR is not set # CONFIG_EEPROM_93XX46 is not set +# CONFIG_NVMEM_ATMEL_SHA204A is not set # # Bus devices @@ -896,6 +916,15 @@ CONFIG_REGULATOR_FIXED=y # end of Remoteproc drivers # CONFIG_RESET_CONTROLLER is not set +CONFIG_HW_HAS_PCI=y + +# +# PCI bus options +# +# CONFIG_PCI is not set +# CONFIG_PCI_ECAM_GENERIC is not set +# end of PCI bus options + # CONFIG_RTC_CLASS is not set # @@ -977,6 +1006,7 @@ CONFIG_ATMEL_EBI=y CONFIG_FS=y CONFIG_FS_LEGACY=y CONFIG_FS_WRITABLE=y +CONFIG_NETFS_SUPPORT=y # # Some selected filesystems still use the legacy FS API. @@ -1025,8 +1055,95 @@ CONFIG_FS_UBIFS_COMPRESSION_ZSTD=y # # ZSTD support disabled # +# CONFIG_FS_QEMU_FW_CFG is not set # end of Filesystem support +# +# Security options +# +CONFIG_INSECURE=y +# CONFIG_SECURITY_POLICY is not set +# CONFIG_PASSWORD is not set +# CONFIG_CRYPTO_KEYSTORE is not set +# CONFIG_BLOBGEN is not set + +# +# OP-TEE loading +# +# CONFIG_BOOTM_OPTEE is not set +# CONFIG_PBL_OPTEE is not set +# end of OP-TEE loading + +# +# Hardening options +# +# CONFIG_BUG_ON_DATA_CORRUPTION is not set + +# +# Memory initialization +# +CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y +# CONFIG_INIT_STACK_NONE is not set +# CONFIG_INIT_STACK_ALL_PATTERN is not set +CONFIG_INIT_STACK_ALL_ZERO=y +# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set +CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y +# CONFIG_ZERO_CALL_USED_REGS is not set +# end of Memory initialization + +# +# Buffer overflow protection +# +# CONFIG_STACK_GUARD_PAGE is not set +CONFIG_STACKPROTECTOR_NONE=y +# CONFIG_STACKPROTECTOR_STRONG is not set +CONFIG_PBL_STACKPROTECTOR_NONE=y +# CONFIG_PBL_STACKPROTECTOR_STRONG is not set +# end of Buffer overflow protection +# end of Hardening options + +CONFIG_HAS_INSECURE_DEFAULTS=y + +# +# This barebox configuration has CONFIG_HAS_INSECURE_DEFAULTS=y indicating +# + +# +# that some of the configured options have potentially insecure defaults. +# + +# +# Extra care needs to be taken in secure booted systems. +# +# end of Security options + +# +# Crypto support +# +CONFIG_CRC32=y +CONFIG_DIGEST=y +CONFIG_HAVE_DIGEST_MD5=y +CONFIG_HAVE_DIGEST_SHA1=y +CONFIG_HAVE_DIGEST_SHA224=y +CONFIG_HAVE_DIGEST_SHA256=y +# CONFIG_DIGEST_CRC32_GENERIC is not set +CONFIG_DIGEST_MD5_GENERIC=y +CONFIG_DIGEST_SHA1_GENERIC=y +# CONFIG_DIGEST_SHA224_GENERIC is not set +# CONFIG_DIGEST_SHA256_GENERIC is not set +# CONFIG_DIGEST_SHA384_GENERIC is not set +# CONFIG_DIGEST_SHA512_GENERIC is not set +# CONFIG_DIGEST_HMAC_GENERIC is not set +CONFIG_DIGEST_SHA1_ARM=y +CONFIG_DIGEST_SHA256_ARM=y +# CONFIG_CRYPTO_RSA is not set +# CONFIG_CRYPTO_ECDSA is not set +# CONFIG_CRYPTO_BUILTIN_KEYS is not set +# end of Crypto support + # # Library routines # @@ -1051,6 +1168,7 @@ CONFIG_LIBFDT=y # CONFIG_ALLOW_PRNG_FALLBACK is not set # CONFIG_CRC_CCITT is not set # CONFIG_CRC8 is not set +# CONFIG_CRC16 is not set # # Library gui routines @@ -1059,74 +1177,9 @@ CONFIG_LIBFDT=y CONFIG_PRINTF_UUID=y CONFIG_NLS=y -# CONFIG_BLOBGEN is not set CONFIG_GENERIC_ALLOCATOR=y # end of Library routines -# -# Hardening options -# - -# -# This barebox configuration has CONFIG_HAS_INSECURE_DEFAULTS=y indicating -# - -# -# that some of the configured options have potentially insecure defaults. -# - -# -# Extra care needs to be taken in secure booted systems. -# -# CONFIG_BUG_ON_DATA_CORRUPTION is not set - -# -# Memory initialization -# -CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y -# CONFIG_INIT_STACK_NONE is not set -# CONFIG_INIT_STACK_ALL_PATTERN is not set -CONFIG_INIT_STACK_ALL_ZERO=y -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set -# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set -CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y -# CONFIG_ZERO_CALL_USED_REGS is not set -# end of Memory initialization - -# CONFIG_STACK_GUARD_PAGE is not set -CONFIG_STACKPROTECTOR_NONE=y -# CONFIG_STACKPROTECTOR_STRONG is not set -CONFIG_PBL_STACKPROTECTOR_NONE=y -# CONFIG_PBL_STACKPROTECTOR_STRONG is not set -# end of Hardening options - -# -# Crypto support -# -CONFIG_CRC32=y -CONFIG_DIGEST=y -CONFIG_HAVE_DIGEST_MD5=y -CONFIG_HAVE_DIGEST_SHA1=y -CONFIG_HAVE_DIGEST_SHA224=y -CONFIG_HAVE_DIGEST_SHA256=y -# CONFIG_DIGEST_CRC32_GENERIC is not set -CONFIG_DIGEST_MD5_GENERIC=y -CONFIG_DIGEST_SHA1_GENERIC=y -# CONFIG_DIGEST_SHA224_GENERIC is not set -# CONFIG_DIGEST_SHA256_GENERIC is not set -# CONFIG_DIGEST_SHA384_GENERIC is not set -# CONFIG_DIGEST_SHA512_GENERIC is not set -# CONFIG_DIGEST_HMAC_GENERIC is not set -CONFIG_DIGEST_SHA1_ARM=y -CONFIG_DIGEST_SHA256_ARM=y -# CONFIG_CRYPTO_RSA is not set -# CONFIG_CRYPTO_ECDSA is not set -# CONFIG_CRYPTO_BUILTIN_KEYS is not set -# CONFIG_CRYPTO_KEYSTORE is not set -# end of Crypto support - # # Firmware files # diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff index 06cf114..2d30350 100644 --- a/configs/platform-v7a/barebox-at91.config.diff +++ b/configs/platform-v7a/barebox-at91.config.diff @@ -1,5 +1,5 @@ -580ac4a756d6b0fd89919a94c117d25f -a113ae91a19f37cefe79fbd73dc0e06f +b3a232571636cb6a3f5f35122678bb5e +1e641d2703b309f57bdf1cfbf638172a CONFIG_ARCH_AT91=y # CONFIG_ARCH_BCM283X is not set # CONFIG_ARCH_IMX is undefined @@ -7,6 +7,7 @@ CONFIG_ARCH_AT91=y # CONFIG_ARCH_MULTIARCH is not set # CONFIG_ARCH_OMAP_MULTI is undefined # CONFIG_ARCH_ROCKCHIP is undefined +# CONFIG_ARCH_SAMSUNG is undefined # CONFIG_ARCH_SUNXI is undefined # CONFIG_ARM_SECURE_MONITOR is undefined # CONFIG_ARM_SMCCC is undefined @@ -99,6 +100,7 @@ CONFIG_MCI_ATMEL_SDHCI_PBL=y CONFIG_MCI_MMC_BOOT_PARTITIONS=y CONFIG_MCI_SDHCI=y # CONFIG_MCI_STARTUP is not set +CONFIG_MCI_STARTUP_NONE=y CONFIG_MFD_ATMEL_FLEXCOM=y CONFIG_MFD_ATMEL_SMC=y CONFIG_MFD_SYSCON=y @@ -126,6 +128,8 @@ CONFIG_NAND_NEED_EXEC_OP=y # CONFIG_NET_USB_RTL8152 is undefined # CONFIG_NET_USB_SMSC95XX is undefined CONFIG_NVMEM=y +# CONFIG_NVMEM_ATMEL_SHA204A is not set +CONFIG_NVMEM_LAYOUTS=y # CONFIG_NVMEM_REBOOT_MODE is not set # CONFIG_NVMEM_RMEM is not set # CONFIG_NVMEM_SNVS_LPGPR is not set diff --git a/configs/platform-v7a/barebox-common.config b/configs/platform-v7a/barebox-common.config index 540bb67..d33ee4d 100644 --- a/configs/platform-v7a/barebox-common.config +++ b/configs/platform-v7a/barebox-common.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2025.06.1 Configuration +# Barebox/arm 2025.11.0 Configuration # CONFIG_ARM=y CONFIG_ARCH_LINUX_NAME="arm" @@ -28,6 +28,7 @@ CONFIG_ARCH_BCM283X=y # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_OMAP_MULTI is not set # CONFIG_ARCH_ROCKCHIP is not set +# CONFIG_ARCH_SAMSUNG is not set # CONFIG_ARCH_STM32MP is not set # CONFIG_ARCH_VERSATILE is not set # CONFIG_ARCH_VEXPRESS is not set @@ -59,7 +60,6 @@ CONFIG_MACH_RPI3=y CONFIG_BOARD_ARM_GENERIC_DT=y CONFIG_AEABI=y # CONFIG_THUMB2_BAREBOX is not set -# CONFIG_ARM_BOARD_APPEND_ATAG is not set # end of System Type # CONFIG_64BIT is not set @@ -70,11 +70,14 @@ CONFIG_32BIT=y # CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_EXCEPTIONS=y +# CONFIG_ARM_EXCEPTIONS_PBL is not set CONFIG_ARM_UNWIND=y +CONFIG_ARM_MMU_PERMISSIONS=y # CONFIG_ARM_SEMIHOSTING is not set CONFIG_ARM_SMCCC=y CONFIG_ARM_SECURE_MONITOR=y # CONFIG_ARM_PSCI_CLIENT is not set +# CONFIG_BOOT_ATAGS is not set # CONFIG_ARM_BOOTM_ELF is not set # CONFIG_ARM_BOOTM_FIP is not set # end of ARM specific settings @@ -86,10 +89,12 @@ CONFIG_BOARD_GENERIC_DT=y # CONFIG_BOARD_GENERIC_FIT is not set # end of General architecture-dependent options +CONFIG_ARCH_HAS_DMA_WRITE_COMBINE=y CONFIG_ARCH_HAS_STACK_DUMP=y CONFIG_ARCH_HAS_DATA_ABORT_MASK=y CONFIG_ARCH_HAS_ZERO_PAGE=y CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y +CONFIG_HAVE_ARCH_BOOTM_OFTREE=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_ARCH_HAS_SJLJ=y CONFIG_HAS_DEBUG_LL=y @@ -119,10 +124,9 @@ CONFIG_FASTBOOT_BASE=y # # General Settings # +CONFIG_NAME="" CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y -CONFIG_HAS_INSECURE_DEFAULTS=y -CONFIG_INSECURE=y CONFIG_BANNER=y CONFIG_MEMINFO=y CONFIG_MEMTEST=y @@ -153,17 +157,18 @@ CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff CONFIG_STACK_SIZE=0x8000 CONFIG_MALLOC_SIZE=0x0 +CONFIG_SCRATCH_SIZE=0x8000 CONFIG_MALLOC_ALIGNMENT=8 # end of memory layout # CONFIG_EXPERIMENTAL is not set -# CONFIG_MALLOC_DLMALLOC is not set CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y CONFIG_RELOCATABLE=y # CONFIG_PANIC_POWEROFF is not set # CONFIG_PANIC_HANG is not set CONFIG_PANIC_RESET=y +# CONFIG_PANIC_TRAP is not set CONFIG_PROMPT="barebox>" CONFIG_BAUDRATE=115200 CONFIG_CBSIZE=1024 @@ -178,7 +183,6 @@ CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y -# CONFIG_PASSWORD is not set CONFIG_ERRNO_MESSAGES=y CONFIG_TIMESTAMP=y CONFIG_BOOTM=y @@ -187,6 +191,7 @@ CONFIG_BOOTM_SHOW_TYPE=y CONFIG_BOOTM_VERBOSE=y CONFIG_BOOTM_INITRD=y CONFIG_BOOTM_OFTREE=y +# CONFIG_BOOTM_OFTREE_FALLBACK is not set CONFIG_BOOTM_UIMAGE=y # CONFIG_BOOTM_OFTREE_UIMAGE is not set # CONFIG_BOOTM_AIMAGE is not set @@ -227,7 +232,9 @@ CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" CONFIG_HAS_SCHED=y CONFIG_POLLER=y +CONFIG_POLLER_WARN_OVERTIME=y CONFIG_BTHREAD=y +# CONFIG_TLV is not set CONFIG_STATE=y # CONFIG_STATE_CRYPTO is not set # CONFIG_STATE_BACKWARD_COMPATIBLE is not set @@ -236,16 +243,10 @@ CONFIG_BOOT_DEFAULTS=y CONFIG_BAREBOX_DT_2ND=y CONFIG_RESET_SOURCE=y # CONFIG_MACHINE_ID is not set +# CONFIG_SERIAL_NUMBER_FIXUP_SYSTEMD_HOSTNAME is not set # CONFIG_SYSTEMD_OF_WATCHDOG is not set CONFIG_EXTERNAL_DTS_FRAGMENTS="${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi" - -# -# OP-TEE loading -# -# CONFIG_BOOTM_OPTEE is not set -# CONFIG_PBL_OPTEE is not set CONFIG_FILETYPE_STRINGS=y -# end of OP-TEE loading # # Android Fastboot @@ -313,6 +314,7 @@ CONFIG_CMD_BLKSTATS=y CONFIG_CMD_REGULATOR=y # CONFIG_CMD_VARINFO is not set CONFIG_CMD_VERSION=y +# CONFIG_CMD_BFETCH is not set CONFIG_CMD_MMC=y # CONFIG_CMD_MMC_EXTCSD is not set # CONFIG_CMD_POLLER is not set @@ -350,6 +352,7 @@ CONFIG_CMD_UMOUNT=y # # Environment # +# CONFIG_CMD_CREATENV is not set CONFIG_CMD_NV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_DEFAULTENV=y @@ -427,7 +430,6 @@ CONFIG_CMD_CLEAR=y CONFIG_CMD_ECHO=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_EDIT=y -# CONFIG_CMD_LOGIN is not set CONFIG_CMD_MENU=y # CONFIG_CMD_MENU_MANAGEMENT is not set CONFIG_CMD_MENUTREE=y @@ -471,12 +473,18 @@ CONFIG_CMD_WD=y CONFIG_CMD_WD_DEFAULT_TIMOUT=0 # end of Hardware manipulation +# +# Security +# +# CONFIG_CMD_BLOBGEN is not set +# CONFIG_CMD_LOGIN is not set +# end of Security + # # Miscellaneous # # CONFIG_CMD_2048 is not set CONFIG_CMD_BAREBOX_UPDATE=y -# CONFIG_CMD_BLOBGEN is not set # CONFIG_CMD_FIRMWARELOAD is not set # CONFIG_CMD_KALLSYMS is not set CONFIG_CMD_OF_COMPATIBLE=y @@ -506,10 +514,12 @@ CONFIG_NET_IFUP=y CONFIG_NET_DHCP=y # CONFIG_NET_SNTP is not set CONFIG_NET_FASTBOOT=y +# CONFIG_NET_9P is not set # # Drivers # +# CONFIG_DEEP_PROBE_DEFAULT is not set CONFIG_OFTREE=y CONFIG_OFTREE_MEM_GENERIC=y CONFIG_DTC=y @@ -557,6 +567,7 @@ CONFIG_PHYLIB=y # # MII PHY device drivers # +# CONFIG_ADIN_PHY is not set # CONFIG_AR8327N_PHY is not set # CONFIG_AT803X_PHY is not set # CONFIG_DAVICOM_PHY is not set @@ -649,6 +660,7 @@ CONFIG_MTD_OOB_DEVICE=y # CONFIG_MTD_UBI is not set CONFIG_DISK=y CONFIG_DISK_WRITE=y +# CONFIG_DM_BLK is not set # # drive types @@ -695,6 +707,8 @@ CONFIG_MCI=y # --- Feature list --- # # CONFIG_MCI_TUNING is not set +# CONFIG_MCI_STARTUP_NONE is not set +# CONFIG_MCI_STARTUP_NONREMOVABLE is not set CONFIG_MCI_STARTUP=y CONFIG_MCI_INFO=y CONFIG_MCI_WRITE=y @@ -716,6 +730,7 @@ CONFIG_MCI_MMCI=y # CONFIG_MCI_ARASAN is not set # CONFIG_MCI_AM654 is not set # CONFIG_MCI_SPI is not set +# CONFIG_MMC_CADENCE_SDHCI is not set CONFIG_HAVE_CLK=y CONFIG_CLKDEV_LOOKUP=y CONFIG_COMMON_CLK=y @@ -856,6 +871,15 @@ CONFIG_REGULATOR_BCM283X=y # end of Remoteproc drivers # CONFIG_RESET_CONTROLLER is not set +CONFIG_HW_HAS_PCI=y + +# +# PCI bus options +# +# CONFIG_PCI is not set +# CONFIG_PCI_ECAM_GENERIC is not set +# end of PCI bus options + # CONFIG_RTC_CLASS is not set # @@ -934,6 +958,7 @@ CONFIG_REGULATOR_BCM283X=y CONFIG_FS=y CONFIG_FS_LEGACY=y CONFIG_FS_WRITABLE=y +CONFIG_NETFS_SUPPORT=y # # Some selected filesystems still use the legacy FS API. @@ -978,8 +1003,95 @@ CONFIG_FS_FAT_LFN=y # # ZSTD support disabled # +# CONFIG_FS_QEMU_FW_CFG is not set # end of Filesystem support +# +# Security options +# +CONFIG_INSECURE=y +# CONFIG_SECURITY_POLICY is not set +# CONFIG_PASSWORD is not set +# CONFIG_CRYPTO_KEYSTORE is not set +# CONFIG_BLOBGEN is not set + +# +# OP-TEE loading +# +# CONFIG_BOOTM_OPTEE is not set +# CONFIG_PBL_OPTEE is not set +# end of OP-TEE loading + +# +# Hardening options +# +# CONFIG_BUG_ON_DATA_CORRUPTION is not set + +# +# Memory initialization +# +CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y +# CONFIG_INIT_STACK_NONE is not set +# CONFIG_INIT_STACK_ALL_PATTERN is not set +CONFIG_INIT_STACK_ALL_ZERO=y +# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set +CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y +# CONFIG_ZERO_CALL_USED_REGS is not set +# end of Memory initialization + +# +# Buffer overflow protection +# +# CONFIG_STACK_GUARD_PAGE is not set +CONFIG_STACKPROTECTOR_NONE=y +# CONFIG_STACKPROTECTOR_STRONG is not set +CONFIG_PBL_STACKPROTECTOR_NONE=y +# CONFIG_PBL_STACKPROTECTOR_STRONG is not set +# end of Buffer overflow protection +# end of Hardening options + +CONFIG_HAS_INSECURE_DEFAULTS=y + +# +# This barebox configuration has CONFIG_HAS_INSECURE_DEFAULTS=y indicating +# + +# +# that some of the configured options have potentially insecure defaults. +# + +# +# Extra care needs to be taken in secure booted systems. +# +# end of Security options + +# +# Crypto support +# +CONFIG_CRC32=y +CONFIG_DIGEST=y +CONFIG_HAVE_DIGEST_MD5=y +CONFIG_HAVE_DIGEST_SHA1=y +CONFIG_HAVE_DIGEST_SHA224=y +CONFIG_HAVE_DIGEST_SHA256=y +# CONFIG_DIGEST_CRC32_GENERIC is not set +CONFIG_DIGEST_MD5_GENERIC=y +CONFIG_DIGEST_SHA1_GENERIC=y +# CONFIG_DIGEST_SHA224_GENERIC is not set +# CONFIG_DIGEST_SHA256_GENERIC is not set +# CONFIG_DIGEST_SHA384_GENERIC is not set +# CONFIG_DIGEST_SHA512_GENERIC is not set +# CONFIG_DIGEST_HMAC_GENERIC is not set +CONFIG_DIGEST_SHA1_ARM=y +CONFIG_DIGEST_SHA256_ARM=y +# CONFIG_CRYPTO_RSA is not set +# CONFIG_CRYPTO_ECDSA is not set +# CONFIG_CRYPTO_BUILTIN_KEYS is not set +# end of Crypto support + # # Library routines # @@ -1008,6 +1120,7 @@ CONFIG_LIBFDT=y # CONFIG_ALLOW_PRNG_FALLBACK is not set # CONFIG_CRC_CCITT is not set # CONFIG_CRC8 is not set +# CONFIG_CRC16 is not set # # Library gui routines @@ -1016,73 +1129,8 @@ CONFIG_LIBFDT=y CONFIG_PRINTF_UUID=y CONFIG_NLS=y -# CONFIG_BLOBGEN is not set # end of Library routines -# -# Hardening options -# - -# -# This barebox configuration has CONFIG_HAS_INSECURE_DEFAULTS=y indicating -# - -# -# that some of the configured options have potentially insecure defaults. -# - -# -# Extra care needs to be taken in secure booted systems. -# -# CONFIG_BUG_ON_DATA_CORRUPTION is not set - -# -# Memory initialization -# -CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y -# CONFIG_INIT_STACK_NONE is not set -# CONFIG_INIT_STACK_ALL_PATTERN is not set -CONFIG_INIT_STACK_ALL_ZERO=y -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set -# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set -CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y -# CONFIG_ZERO_CALL_USED_REGS is not set -# end of Memory initialization - -# CONFIG_STACK_GUARD_PAGE is not set -CONFIG_STACKPROTECTOR_NONE=y -# CONFIG_STACKPROTECTOR_STRONG is not set -CONFIG_PBL_STACKPROTECTOR_NONE=y -# CONFIG_PBL_STACKPROTECTOR_STRONG is not set -# end of Hardening options - -# -# Crypto support -# -CONFIG_CRC32=y -CONFIG_DIGEST=y -CONFIG_HAVE_DIGEST_MD5=y -CONFIG_HAVE_DIGEST_SHA1=y -CONFIG_HAVE_DIGEST_SHA224=y -CONFIG_HAVE_DIGEST_SHA256=y -# CONFIG_DIGEST_CRC32_GENERIC is not set -CONFIG_DIGEST_MD5_GENERIC=y -CONFIG_DIGEST_SHA1_GENERIC=y -# CONFIG_DIGEST_SHA224_GENERIC is not set -# CONFIG_DIGEST_SHA256_GENERIC is not set -# CONFIG_DIGEST_SHA384_GENERIC is not set -# CONFIG_DIGEST_SHA512_GENERIC is not set -# CONFIG_DIGEST_HMAC_GENERIC is not set -CONFIG_DIGEST_SHA1_ARM=y -CONFIG_DIGEST_SHA256_ARM=y -# CONFIG_CRYPTO_RSA is not set -# CONFIG_CRYPTO_ECDSA is not set -# CONFIG_CRYPTO_BUILTIN_KEYS is not set -# CONFIG_CRYPTO_KEYSTORE is not set -# end of Crypto support - # # Firmware files # diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config index b2b4b29..cec38e4 100644 --- a/configs/platform-v7a/barebox.config +++ b/configs/platform-v7a/barebox.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2025.06.1 Configuration +# Barebox/arm 2025.11.0 Configuration # CONFIG_ARM=y CONFIG_ARCH_LINUX_NAME="arm" @@ -30,6 +30,7 @@ CONFIG_ARCH_IMX=y # CONFIG_ARCH_LAYERSCAPE is not set CONFIG_ARCH_OMAP_MULTI=y # CONFIG_ARCH_ROCKCHIP is not set +# CONFIG_ARCH_SAMSUNG is not set CONFIG_ARCH_STM32MP=y # CONFIG_ARCH_VERSATILE is not set CONFIG_ARCH_VEXPRESS=y @@ -213,8 +214,6 @@ CONFIG_MACH_VEXPRESS=y CONFIG_BOARD_ARM_GENERIC_DT=y CONFIG_AEABI=y CONFIG_THUMB2_BAREBOX=y -CONFIG_ARM_BOARD_APPEND_ATAG=y -# CONFIG_ARM_BOARD_PREPEND_ATAG is not set # end of System Type # CONFIG_64BIT is not set @@ -225,12 +224,15 @@ CONFIG_32BIT=y # CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_EXCEPTIONS=y +# CONFIG_ARM_EXCEPTIONS_PBL is not set CONFIG_ARM_UNWIND=y +CONFIG_ARM_MMU_PERMISSIONS=y # CONFIG_ARM_SEMIHOSTING is not set CONFIG_ARM_SMCCC=y CONFIG_ARM_SECURE_MONITOR=y CONFIG_ARM_PSCI_OF=y CONFIG_ARM_PSCI_CLIENT=y +# CONFIG_BOOT_ATAGS is not set # CONFIG_ARM_BOOTM_ELF is not set # CONFIG_ARM_BOOTM_FIP is not set # end of ARM specific settings @@ -242,10 +244,12 @@ CONFIG_BOARD_GENERIC_DT=y # CONFIG_BOARD_GENERIC_FIT is not set # end of General architecture-dependent options +CONFIG_ARCH_HAS_DMA_WRITE_COMBINE=y CONFIG_ARCH_HAS_STACK_DUMP=y CONFIG_ARCH_HAS_DATA_ABORT_MASK=y CONFIG_ARCH_HAS_ZERO_PAGE=y CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y +CONFIG_HAVE_ARCH_BOOTM_OFTREE=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_ARCH_HAS_SJLJ=y CONFIG_HAS_DEBUG_LL=y @@ -276,10 +280,9 @@ CONFIG_FASTBOOT_BASE=y # # General Settings # +CONFIG_NAME="" CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y -CONFIG_HAS_INSECURE_DEFAULTS=y -CONFIG_INSECURE=y CONFIG_BANNER=y CONFIG_MEMINFO=y CONFIG_MEMTEST=y @@ -311,17 +314,18 @@ CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff CONFIG_STACK_SIZE=0x8000 CONFIG_MALLOC_SIZE=0x0 +CONFIG_SCRATCH_SIZE=0x8000 CONFIG_MALLOC_ALIGNMENT=8 # end of memory layout # CONFIG_EXPERIMENTAL is not set -# CONFIG_MALLOC_DLMALLOC is not set CONFIG_MALLOC_TLSF=y CONFIG_KALLSYMS=y CONFIG_RELOCATABLE=y # CONFIG_PANIC_POWEROFF is not set # CONFIG_PANIC_HANG is not set CONFIG_PANIC_RESET=y +# CONFIG_PANIC_TRAP is not set CONFIG_PROMPT="barebox> " CONFIG_BAUDRATE=115200 CONFIG_CBSIZE=1024 @@ -336,7 +340,6 @@ CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y -# CONFIG_PASSWORD is not set CONFIG_ERRNO_MESSAGES=y # CONFIG_TIMESTAMP is not set CONFIG_BOOTM=y @@ -345,6 +348,7 @@ CONFIG_BOOTM_SHOW_TYPE=y CONFIG_BOOTM_VERBOSE=y CONFIG_BOOTM_INITRD=y CONFIG_BOOTM_OFTREE=y +# CONFIG_BOOTM_OFTREE_FALLBACK is not set CONFIG_BOOTM_UIMAGE=y CONFIG_BOOTM_OFTREE_UIMAGE=y # CONFIG_BOOTM_AIMAGE is not set @@ -386,7 +390,9 @@ CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_DFU=y CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" CONFIG_HAS_SCHED=y CONFIG_POLLER=y +CONFIG_POLLER_WARN_OVERTIME=y CONFIG_BTHREAD=y +# CONFIG_TLV is not set CONFIG_STATE=y # CONFIG_STATE_CRYPTO is not set # CONFIG_STATE_BACKWARD_COMPATIBLE is not set @@ -395,18 +401,10 @@ CONFIG_BOOT_DEFAULTS=y CONFIG_BAREBOX_DT_2ND=y CONFIG_RESET_SOURCE=y CONFIG_MACHINE_ID=y +# CONFIG_SERIAL_NUMBER_FIXUP_SYSTEMD_HOSTNAME is not set # CONFIG_SYSTEMD_OF_WATCHDOG is not set CONFIG_EXTERNAL_DTS_FRAGMENTS="${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi" - -# -# OP-TEE loading -# -CONFIG_HAVE_OPTEE=y -CONFIG_OPTEE_SIZE=0x03000000 -CONFIG_OPTEE_SHM_SIZE=0x400000 -# CONFIG_BOOTM_OPTEE is not set CONFIG_FILETYPE_STRINGS=y -# end of OP-TEE loading # # Android Fastboot @@ -478,6 +476,7 @@ CONFIG_CMD_REGULATOR=y # CONFIG_CMD_NVMEM is not set # CONFIG_CMD_VARINFO is not set CONFIG_CMD_VERSION=y +# CONFIG_CMD_BFETCH is not set CONFIG_CMD_MMC=y CONFIG_CMD_MMC_EXTCSD=y # CONFIG_CMD_POLLER is not set @@ -518,6 +517,7 @@ CONFIG_CMD_UMOUNT=y # # Environment # +# CONFIG_CMD_CREATENV is not set CONFIG_CMD_NV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_DEFAULTENV=y @@ -595,7 +595,6 @@ CONFIG_CMD_CLEAR=y CONFIG_CMD_ECHO=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_EDIT=y -# CONFIG_CMD_LOGIN is not set CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y CONFIG_CMD_MENUTREE=y @@ -646,15 +645,21 @@ CONFIG_CMD_WD=y CONFIG_CMD_WD_DEFAULT_TIMOUT=0 # end of Hardware manipulation +# +# Security +# +# CONFIG_CMD_BLOBGEN is not set +# CONFIG_CMD_KEYSTORE is not set +# CONFIG_CMD_LOGIN is not set +# end of Security + # # Miscellaneous # # CONFIG_CMD_2048 is not set CONFIG_CMD_BAREBOX_UPDATE=y -# CONFIG_CMD_BLOBGEN is not set # CONFIG_CMD_FIRMWARELOAD is not set # CONFIG_CMD_KALLSYMS is not set -# CONFIG_CMD_KEYSTORE is not set CONFIG_CMD_OF_COMPATIBLE=y CONFIG_CMD_OF_DIFF=y CONFIG_CMD_OF_DUMP=y @@ -684,10 +689,12 @@ CONFIG_NET_IFUP=y CONFIG_NET_DHCP=y # CONFIG_NET_SNTP is not set CONFIG_NET_FASTBOOT=y +# CONFIG_NET_9P is not set # # Drivers # +# CONFIG_DEEP_PROBE_DEFAULT is not set CONFIG_REGMAP_FORMATTED=y CONFIG_REGMAP_I2C=y CONFIG_OFTREE=y @@ -748,6 +755,7 @@ CONFIG_DRIVER_NET_SMC911X=y # # MII PHY device drivers # +# CONFIG_ADIN_PHY is not set # CONFIG_AR8327N_PHY is not set CONFIG_AT803X_PHY=y # CONFIG_DAVICOM_PHY is not set @@ -888,6 +896,7 @@ CONFIG_MTD_UBI_FASTMAP=y CONFIG_DISK=y CONFIG_DISK_IDE_SFF=y CONFIG_DISK_WRITE=y +# CONFIG_DM_BLK is not set # # drive types @@ -944,6 +953,7 @@ CONFIG_VIDEO=y # CONFIG_DRIVER_VIDEO_FB_SSD1307 is not set CONFIG_VIDEO_VPL=y # CONFIG_DRIVER_VIDEO_STM32_LTDC is not set +# CONFIG_DRIVER_VIDEO_STM32_DSI is not set # CONFIG_DRIVER_VIDEO_BCM283X is not set # CONFIG_DRIVER_VIDEO_ROCKCHIP is not set CONFIG_DRIVER_VIDEO_IMX_IPUV3=y @@ -966,6 +976,7 @@ CONFIG_DRIVER_VIDEO_SIMPLEFB=y # CONFIG_DRIVER_VIDEO_PANEL_SITRONIX_ST7789V is not set # CONFIG_DRIVER_VIDEO_PANEL_MIPI_DBI is not set # CONFIG_DRIVER_VIDEO_DW_HDMI is not set +# CONFIG_DRIVER_VIDEO_DW_MIPI_DSI is not set # CONFIG_SOUND is not set CONFIG_MCI_SDHCI=y CONFIG_MCI=y @@ -974,6 +985,8 @@ CONFIG_MCI=y # --- Feature list --- # # CONFIG_MCI_TUNING is not set +# CONFIG_MCI_STARTUP_NONE is not set +# CONFIG_MCI_STARTUP_NONREMOVABLE is not set CONFIG_MCI_STARTUP=y CONFIG_MCI_INFO=y CONFIG_MCI_WRITE=y @@ -999,6 +1012,7 @@ CONFIG_MCI_MMCI=y # CONFIG_MCI_AM654 is not set # CONFIG_MCI_SPI is not set CONFIG_MCI_STM32_SDMMC2=y +# CONFIG_MMC_CADENCE_SDHCI is not set CONFIG_MCI_OMAP_HSMMC_PBL=y CONFIG_HAVE_CLK=y CONFIG_CLKDEV_LOOKUP=y @@ -1154,6 +1168,11 @@ CONFIG_PINCTRL_STM32=y # end of Pin controllers CONFIG_NVMEM=y +CONFIG_NVMEM_LAYOUTS=y + +# +# Layout Types +# # CONFIG_NVMEM_RMEM is not set # CONFIG_NVMEM_SNVS_LPGPR is not set CONFIG_IMX_OCOTP=y @@ -1162,6 +1181,7 @@ CONFIG_IMX_OCOTP=y CONFIG_STM32_BSEC=y CONFIG_STM32_BSEC_WRITE=y CONFIG_STM32_BSEC_OPTEE_TA=y +# CONFIG_NVMEM_ATMEL_SHA204A is not set # # Bus devices @@ -1195,6 +1215,7 @@ CONFIG_RESET_CONTROLLER=y CONFIG_RESET_SIMPLE=y # CONFIG_RESET_IMX7 is not set CONFIG_RESET_SCMI=y +# CONFIG_RESET_SOCFPGA32 is not set CONFIG_HW_HAS_PCI=y # @@ -1302,6 +1323,7 @@ CONFIG_OF_FIXUP_OPTEE=y CONFIG_FS=y CONFIG_FS_LEGACY=y CONFIG_FS_WRITABLE=y +CONFIG_NETFS_SUPPORT=y # # Some selected filesystems still use the legacy FS API. @@ -1350,8 +1372,100 @@ CONFIG_FS_UBIFS_COMPRESSION_ZSTD=y # # ZSTD support disabled # +# CONFIG_FS_QEMU_FW_CFG is not set # end of Filesystem support +# +# Security options +# +CONFIG_INSECURE=y +# CONFIG_SECURITY_POLICY is not set +# CONFIG_PASSWORD is not set +CONFIG_CRYPTO_KEYSTORE=y +# CONFIG_BLOBGEN is not set + +# +# OP-TEE loading +# +CONFIG_HAVE_OPTEE=y +CONFIG_OPTEE_SIZE=0x03000000 +CONFIG_OPTEE_SHM_SIZE=0x400000 +# CONFIG_BOOTM_OPTEE is not set +# CONFIG_PBL_OPTEE is not set +# end of OP-TEE loading + +# +# Hardening options +# +# CONFIG_BUG_ON_DATA_CORRUPTION is not set + +# +# Memory initialization +# +CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y +# CONFIG_INIT_STACK_NONE is not set +# CONFIG_INIT_STACK_ALL_PATTERN is not set +CONFIG_INIT_STACK_ALL_ZERO=y +# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set +CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y +# CONFIG_ZERO_CALL_USED_REGS is not set +# end of Memory initialization + +# +# Buffer overflow protection +# +# CONFIG_STACK_GUARD_PAGE is not set +CONFIG_STACKPROTECTOR=y +# CONFIG_STACKPROTECTOR_NONE is not set +CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_PBL_STACKPROTECTOR_NONE=y +# CONFIG_PBL_STACKPROTECTOR_STRONG is not set +# end of Buffer overflow protection +# end of Hardening options + +CONFIG_HAS_INSECURE_DEFAULTS=y + +# +# This barebox configuration has CONFIG_HAS_INSECURE_DEFAULTS=y indicating +# + +# +# that some of the configured options have potentially insecure defaults. +# + +# +# Extra care needs to be taken in secure booted systems. +# +# end of Security options + +# +# Crypto support +# +CONFIG_CRC32=y +CONFIG_DIGEST=y +CONFIG_HAVE_DIGEST_MD5=y +CONFIG_HAVE_DIGEST_SHA1=y +CONFIG_HAVE_DIGEST_SHA224=y +CONFIG_HAVE_DIGEST_SHA256=y +CONFIG_HAVE_DIGEST_HMAC=y +# CONFIG_DIGEST_CRC32_GENERIC is not set +CONFIG_DIGEST_MD5_GENERIC=y +CONFIG_DIGEST_SHA1_GENERIC=y +# CONFIG_DIGEST_SHA224_GENERIC is not set +# CONFIG_DIGEST_SHA256_GENERIC is not set +# CONFIG_DIGEST_SHA384_GENERIC is not set +# CONFIG_DIGEST_SHA512_GENERIC is not set +CONFIG_DIGEST_HMAC_GENERIC=y +CONFIG_DIGEST_SHA1_ARM=y +CONFIG_DIGEST_SHA256_ARM=y +# CONFIG_CRYPTO_RSA is not set +# CONFIG_CRYPTO_ECDSA is not set +# CONFIG_CRYPTO_BUILTIN_KEYS is not set +# end of Crypto support + # # Library routines # @@ -1386,6 +1500,7 @@ CONFIG_LIBFDT=y CONFIG_ALLOW_PRNG_FALLBACK=y # CONFIG_CRC_CCITT is not set CONFIG_CRC8=y +# CONFIG_CRC16 is not set # # Library gui routines @@ -1401,76 +1516,9 @@ CONFIG_LODEPNG=y # CONFIG_BAREBOX_LOGO is not set CONFIG_PRINTF_UUID=y CONFIG_NLS=y -# CONFIG_BLOBGEN is not set CONFIG_IDR=y # end of Library routines -# -# Hardening options -# - -# -# This barebox configuration has CONFIG_HAS_INSECURE_DEFAULTS=y indicating -# - -# -# that some of the configured options have potentially insecure defaults. -# - -# -# Extra care needs to be taken in secure booted systems. -# -# CONFIG_BUG_ON_DATA_CORRUPTION is not set - -# -# Memory initialization -# -CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y -# CONFIG_INIT_STACK_NONE is not set -# CONFIG_INIT_STACK_ALL_PATTERN is not set -CONFIG_INIT_STACK_ALL_ZERO=y -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set -# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set -CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y -# CONFIG_ZERO_CALL_USED_REGS is not set -# end of Memory initialization - -# CONFIG_STACK_GUARD_PAGE is not set -CONFIG_STACKPROTECTOR=y -# CONFIG_STACKPROTECTOR_NONE is not set -CONFIG_STACKPROTECTOR_STRONG=y -CONFIG_PBL_STACKPROTECTOR_NONE=y -# CONFIG_PBL_STACKPROTECTOR_STRONG is not set -# end of Hardening options - -# -# Crypto support -# -CONFIG_CRC32=y -CONFIG_DIGEST=y -CONFIG_HAVE_DIGEST_MD5=y -CONFIG_HAVE_DIGEST_SHA1=y -CONFIG_HAVE_DIGEST_SHA224=y -CONFIG_HAVE_DIGEST_SHA256=y -CONFIG_HAVE_DIGEST_HMAC=y -# CONFIG_DIGEST_CRC32_GENERIC is not set -CONFIG_DIGEST_MD5_GENERIC=y -CONFIG_DIGEST_SHA1_GENERIC=y -# CONFIG_DIGEST_SHA224_GENERIC is not set -# CONFIG_DIGEST_SHA256_GENERIC is not set -# CONFIG_DIGEST_SHA384_GENERIC is not set -# CONFIG_DIGEST_SHA512_GENERIC is not set -CONFIG_DIGEST_HMAC_GENERIC=y -CONFIG_DIGEST_SHA1_ARM=y -CONFIG_DIGEST_SHA256_ARM=y -# CONFIG_CRYPTO_RSA is not set -# CONFIG_CRYPTO_ECDSA is not set -# CONFIG_CRYPTO_BUILTIN_KEYS is not set -CONFIG_CRYPTO_KEYSTORE=y -# end of Crypto support - # # Firmware files # diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig index d044ceb..a2aa6f6 100644 --- a/configs/platform-v7a/platformconfig +++ b/configs/platform-v7a/platformconfig @@ -185,18 +185,18 @@ PTXCONF_AT91BOOTSTRAP2_MD5="ef321a80bf428bfd6cb642c96126ef6c" PTXCONF_AT91BOOTSTRAP2_CONFIG="at91bootstrap-wifx-l1.config" PTXCONF_BAREBOX_COMMON_ARCH_STRING="arm" PTXCONF_BAREBOX_COMMON=y -PTXCONF_BAREBOX_COMMON_VERSION="2025.06.1" -PTXCONF_BAREBOX_COMMON_MD5="b2ba4b194894fb6c4848d260f4e849ff" +PTXCONF_BAREBOX_COMMON_VERSION="2025.11.0" +PTXCONF_BAREBOX_COMMON_MD5="867dea758c6ea8b350bac57009235e88" PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y PTXCONF_BAREBOX_AM335X_MLO=y PTXCONF_BAREBOX_AT91=y PTXCONF_BAREBOX_ARCH_STRING="arm" PTXCONF_BAREBOX_DEPENDENCIES=y PTXCONF_BAREBOX=y -PTXCONF_BAREBOX_VERSION="2025.06.1" +PTXCONF_BAREBOX_VERSION="2025.11.0" PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION=y PTXCONF_BAREBOX_BUILDSYSTEM_VERSION="${PTXDIST_VCS_VERSION}" -PTXCONF_BAREBOX_MD5="b2ba4b194894fb6c4848d260f4e849ff" +PTXCONF_BAREBOX_MD5="867dea758c6ea8b350bac57009235e88" PTXCONF_BAREBOX_CONFIG="barebox.config" # PTXCONF_BAREBOX_FIRMWARE is not set PTXCONF_BAREBOX_EXTRA_ENV=y diff --git a/patches/barebox-2025.06.1/0001-ARM-vexpress-increase-barebox-partition-size.patch b/patches/barebox-2025.06.1/0001-ARM-vexpress-increase-barebox-partition-size.patch deleted file mode 100644 index db5d400..0000000 --- a/patches/barebox-2025.06.1/0001-ARM-vexpress-increase-barebox-partition-size.patch +++ /dev/null @@ -1,74 +0,0 @@ -From: Ahmad Fatoum <a.fatoum@pengutronix.de> -Date: Tue, 24 Jun 2025 20:39:30 +0200 -Subject: [PATCH] ARM: vexpress: increase barebox partition size - -Commit 3630fa400be5 ("ARM: remove vexpress_defconfig") made -multi_v7_defconfig the go-to defconfig for vexpress. - -The multi defconfig enables a lot of drivers and functionality though -increasing the image size from 300K to 1.2M, which causes barebox to -extend beyond the previously configured 512K barebox partition. - -Fix this by giving each of barebox and its environment 2M of space, -which should be enough for many years to come. - -Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> -[rhi: picked from https://lore.barebox.org/barebox/20250624183930.2733353-1-a.fatoum@pengutronix.de/ ] -Signed-off-by: Roland Hieber <rhi@pengutronix.de> ---- - arch/arm/dts/vexpress-v2p-ca15.dts | 11 ++++++++--- - arch/arm/dts/vexpress-v2p-ca9.dts | 10 +++++----- - 2 files changed, 13 insertions(+), 8 deletions(-) - -diff --git a/arch/arm/dts/vexpress-v2p-ca15.dts b/arch/arm/dts/vexpress-v2p-ca15.dts -index acf4e023d5cd..891e6dbbe4b4 100644 ---- a/arch/arm/dts/vexpress-v2p-ca15.dts -+++ b/arch/arm/dts/vexpress-v2p-ca15.dts -@@ -19,12 +19,17 @@ partitions { - - partition@0 { - label = "barebox"; -- reg = <0x0 0x80000>; -+ reg = <0x0 0x200000>; - }; - -- barebox_env: partition@80000 { -+ barebox_env: partition@200000 { - label = "barebox-environment"; -- reg = <0x80000 0x80000>; -+ reg = <0x200000 0x200000>; -+ }; -+ -+ state_storage: partition@400000 { -+ label = "barebox-state"; -+ reg = <0x400000 0x100000>; - }; - }; - }; -diff --git a/arch/arm/dts/vexpress-v2p-ca9.dts b/arch/arm/dts/vexpress-v2p-ca9.dts -index d1484ff4b0a9..c320f67c2371 100644 ---- a/arch/arm/dts/vexpress-v2p-ca9.dts -+++ b/arch/arm/dts/vexpress-v2p-ca9.dts -@@ -77,17 +77,17 @@ partitions { - - partition@0 { - label = "barebox"; -- reg = <0x0 0x80000>; -+ reg = <0x0 0x200000>; - }; - -- barebox_env: partition@80000 { -+ barebox_env: partition@200000 { - label = "barebox-environment"; -- reg = <0x80000 0x80000>; -+ reg = <0x200000 0x200000>; - }; - -- state_storage: partition@100000 { -+ state_storage: partition@400000 { - label = "barebox-state"; -- reg = <0x100000 0x100000>; -+ reg = <0x400000 0x100000>; - }; - }; - }; diff --git a/patches/barebox-2025.06.1/series b/patches/barebox-2025.06.1/series deleted file mode 100644 index e04bbe5..0000000 --- a/patches/barebox-2025.06.1/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-ARM-vexpress-increase-barebox-partition-size.patch -# 292dd68941cabc5983505876cd411f46 - git-ptx-patches magic -- 2.47.3 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [DistroKit] [PATCH v2 2/3] v7a_noneon: barebox: version bump 2025.03.0 -> 2025.11.0 2025-12-02 17:03 [DistroKit] [PATCH v2 0/3] Update barebox to newest version Fabian Pflug 2025-12-02 17:03 ` [DistroKit] [PATCH v2 1/3] v7a: barebox: version bump 2025.06.1 -> 2025.11.0 Fabian Pflug @ 2025-12-02 17:03 ` Fabian Pflug 2025-12-02 17:03 ` [DistroKit] [PATCH v2 3/3] v8a: barebox: version bump 2025.07.0 " Fabian Pflug 2025-12-03 17:38 ` [DistroKit] [PATCH v2 0/3] Update barebox to newest version Robert Schwebel 3 siblings, 0 replies; 5+ messages in thread From: Fabian Pflug @ 2025-12-02 17:03 UTC (permalink / raw) To: distrokit; +Cc: Fabian Pflug Updating barebox to a current version. Run oldconfig and accepting all the defaults, except for BOOTM_OFTREE_FALLBACK, where the recommended n is selected. Signed-off-by: Fabian Pflug <f.pflug@pengutronix.de> --- configs/platform-v7a_noneon/barebox-at91.config | 242 +++++++++++++-------- .../platform-v7a_noneon/barebox-at91.config.diff | 8 +- configs/platform-v7a_noneon/barebox-common.config | 241 ++++++++++++-------- .../platform-v7a_noneon/barebox-vexpress.config | 241 ++++++++++++-------- .../barebox-vexpress.config.diff | 4 +- ...dd-sama5d3-compatible-after-DT-regression.patch | 41 ---- .../patches/barebox-2025.03.0/series | 1 - configs/platform-v7a_noneon/platformconfig | 4 +- 8 files changed, 456 insertions(+), 326 deletions(-) diff --git a/configs/platform-v7a_noneon/barebox-at91.config b/configs/platform-v7a_noneon/barebox-at91.config index 3ada1fb..c2c7130 100644 --- a/configs/platform-v7a_noneon/barebox-at91.config +++ b/configs/platform-v7a_noneon/barebox-at91.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2025.03.0 Configuration +# Barebox/arm 2025.11.0 Configuration # CONFIG_ARM=y CONFIG_ARCH_LINUX_NAME="arm" @@ -43,7 +43,7 @@ CONFIG_HAVE_AT91_USB_CLK=y CONFIG_COMMON_CLK_AT91=y CONFIG_HAVE_AT91_SMD=y CONFIG_HAVE_AT91_DDRAMC=y -CONFIG_AT91_MCI_PBL=y +CONFIG_AT91_PBL=y CONFIG_AT91SAM9_SMC=y CONFIG_HAVE_AT91SAM9_RST=y CONFIG_SOC_SAM_V7=y @@ -71,7 +71,6 @@ CONFIG_MACH_MICROCHIP_SAMA5D3_EDS=y # CONFIG_BOARD_ARM_GENERIC_DT=y CONFIG_AEABI=y -# CONFIG_ARM_BOARD_APPEND_ATAG is not set # end of System Type # CONFIG_64BIT is not set @@ -82,13 +81,16 @@ CONFIG_32BIT=y # CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_EXCEPTIONS=y +# CONFIG_ARM_EXCEPTIONS_PBL is not set CONFIG_ARM_UNWIND=y +CONFIG_ARM_MMU_PERMISSIONS=y # CONFIG_ARM_SEMIHOSTING is not set # CONFIG_ARM_PSCI_CLIENT is not set +# CONFIG_BOOT_ATAGS is not set +# CONFIG_ARM_BOOTM_ELF is not set +# CONFIG_ARM_BOOTM_FIP is not set # end of ARM specific settings -CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y - # # General architecture-dependent options # @@ -96,15 +98,23 @@ CONFIG_BOARD_GENERIC_DT=y # CONFIG_BOARD_GENERIC_FIT is not set # end of General architecture-dependent options +CONFIG_ARCH_HAS_DMA_WRITE_COMBINE=y +CONFIG_ARCH_HAS_STACK_DUMP=y +CONFIG_ARCH_HAS_DATA_ABORT_MASK=y +CONFIG_ARCH_HAS_ZERO_PAGE=y +CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y +CONFIG_HAVE_ARCH_BOOTM_OFTREE=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_ARCH_HAS_SJLJ=y +CONFIG_HAS_DEBUG_LL=y +CONFIG_HAVE_ARCH_KASAN=y CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=140201 CONFIG_CLANG_VERSION=0 CONFIG_GREGORIAN_CALENDER=y CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y -CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y -CONFIG_ARCH_HAS_SJLJ=y CONFIG_GENERIC_GPIO=y CONFIG_BLOCK=y CONFIG_BLOCK_WRITE=y @@ -113,6 +123,7 @@ CONFIG_BINFMT=y CONFIG_UIMAGE=y CONFIG_LOGBUF=y CONFIG_STDDEV=y +CONFIG_CDEV_ALIAS=y CONFIG_UBIFORMAT=y CONFIG_BOOT=y CONFIG_FASTBOOT_BASE=y @@ -120,10 +131,9 @@ CONFIG_FASTBOOT_BASE=y # # General Settings # +CONFIG_NAME="" CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y -CONFIG_HAS_INSECURE_DEFAULTS=y -CONFIG_INSECURE=y CONFIG_BANNER=y CONFIG_MEMINFO=y CONFIG_ENVIRONMENT_VARIABLES=y @@ -152,18 +162,18 @@ CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff CONFIG_STACK_SIZE=0x8000 CONFIG_MALLOC_SIZE=0x0 +CONFIG_SCRATCH_SIZE=0x8000 CONFIG_MALLOC_ALIGNMENT=8 # end of memory layout # CONFIG_EXPERIMENTAL is not set -# CONFIG_MALLOC_DLMALLOC is not set CONFIG_MALLOC_TLSF=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_KALLSYMS=y CONFIG_RELOCATABLE=y # CONFIG_PANIC_POWEROFF is not set # CONFIG_PANIC_HANG is not set CONFIG_PANIC_RESET=y +# CONFIG_PANIC_TRAP is not set CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=115200 CONFIG_CBSIZE=1024 @@ -177,7 +187,6 @@ CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y -# CONFIG_PASSWORD is not set CONFIG_ERRNO_MESSAGES=y CONFIG_TIMESTAMP=y CONFIG_BOOTM=y @@ -186,13 +195,14 @@ CONFIG_BOOTM_SHOW_TYPE=y # CONFIG_BOOTM_VERBOSE is not set CONFIG_BOOTM_INITRD=y CONFIG_BOOTM_OFTREE=y +# CONFIG_BOOTM_OFTREE_FALLBACK is not set # CONFIG_BOOTM_UIMAGE is not set # CONFIG_BOOTM_AIMAGE is not set -# CONFIG_BOOTM_ELF is not set # CONFIG_BOOTM_FITIMAGE is not set CONFIG_BOOTM_OPTIONAL_SIGNED_IMAGES=y CONFIG_BLSPEC=y CONFIG_FLEXIBLE_BOOTARGS=y +CONFIG_ROOTWAIT_BOOTARG=y CONFIG_MMCBLKDEV_ROOTARG=y CONFIG_BAREBOX_UPDATE=y CONFIG_SYSTEM_PARTITIONS=y @@ -223,19 +233,18 @@ CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" CONFIG_HAS_SCHED=y CONFIG_POLLER=y +CONFIG_POLLER_WARN_OVERTIME=y CONFIG_BTHREAD=y +# CONFIG_TLV is not set # CONFIG_STATE is not set # CONFIG_BOOTCHOOSER is not set +CONFIG_BOOT_DEFAULTS=y +CONFIG_BAREBOX_DT_2ND=y CONFIG_RESET_SOURCE=y # CONFIG_MACHINE_ID is not set +# CONFIG_SERIAL_NUMBER_FIXUP_SYSTEMD_HOSTNAME is not set CONFIG_EXTERNAL_DTS_FRAGMENTS="" - -# -# OP-TEE loading -# -# CONFIG_BOOTM_OPTEE is not set -# CONFIG_PBL_OPTEE is not set -# end of OP-TEE loading +CONFIG_FILETYPE_STRINGS=y # # Android Fastboot @@ -250,7 +259,6 @@ CONFIG_FASTBOOT_CMD_OEM=y # CONFIG_COMPILE_LOGLEVEL=6 CONFIG_DEFAULT_LOGLEVEL=6 -CONFIG_HAS_DEBUG_LL=y # CONFIG_DEBUG_LL is not set CONFIG_DEBUG_AT91_UART_BASE=0xffffee00 # CONFIG_DEBUG_INITCALLS is not set @@ -262,7 +270,6 @@ CONFIG_DEBUG_AT91_UART_BASE=0xffffee00 # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set -CONFIG_HAVE_ARCH_KASAN=y CONFIG_CC_HAS_KASAN_GENERIC=y # CONFIG_KASAN is not set # CONFIG_COMPILE_TEST is not set @@ -306,7 +313,9 @@ CONFIG_CMD_MEMINFO=y # CONFIG_CMD_ARM_MMUINFO is not set # CONFIG_CMD_BLKSTATS is not set # CONFIG_CMD_REGULATOR is not set +# CONFIG_CMD_VARINFO is not set CONFIG_CMD_VERSION=y +# CONFIG_CMD_BFETCH is not set # CONFIG_CMD_MMC is not set # CONFIG_CMD_MMC_EXTCSD is not set # CONFIG_CMD_POLLER is not set @@ -346,6 +355,7 @@ CONFIG_CMD_UMOUNT=y # # Environment # +# CONFIG_CMD_CREATENV is not set CONFIG_CMD_NV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_DEFAULTENV=y @@ -371,6 +381,7 @@ CONFIG_CMD_DIRNAME=y CONFIG_CMD_FILETYPE=y CONFIG_CMD_LN=y CONFIG_CMD_LS=y +CONFIG_CMD_TREE=y # CONFIG_CMD_STAT is not set CONFIG_CMD_MD5SUM=y CONFIG_CMD_MKDIR=y @@ -381,6 +392,7 @@ CONFIG_CMD_RMDIR=y CONFIG_CMD_SHA1SUM=y # CONFIG_CMD_SHA224SUM is not set # CONFIG_CMD_SHA256SUM is not set +# CONFIG_CMD_BASE64 is not set # CONFIG_CMD_SHA384SUM is not set # CONFIG_CMD_SHA512SUM is not set # CONFIG_CMD_FIPTOOL is not set @@ -409,6 +421,7 @@ CONFIG_NET_CMD_IFUP=y # CONFIG_CMD_MIITOOL is not set CONFIG_CMD_PING=y # CONFIG_CMD_TFTP is not set +# CONFIG_CMD_IP is not set CONFIG_CMD_IP_ROUTE_GET=y # CONFIG_CMD_ETHLOG is not set # end of Network @@ -420,7 +433,6 @@ CONFIG_CMD_CLEAR=y CONFIG_CMD_ECHO=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_EDIT=y -# CONFIG_CMD_LOGIN is not set # CONFIG_CMD_MENU is not set # CONFIG_CMD_MENUTREE is not set CONFIG_CMD_READLINE=y @@ -447,6 +459,7 @@ CONFIG_CMD_MW=y # # CONFIG_CMD_CLK is not set CONFIG_CMD_DETECT=y +# CONFIG_CMD_TRUNCATE is not set # CONFIG_CMD_SYNC is not set CONFIG_CMD_FLASH=y CONFIG_CMD_GPIO=y @@ -462,12 +475,18 @@ CONFIG_CMD_USB=y CONFIG_CMD_USBGADGET=y # end of Hardware manipulation +# +# Security +# +# CONFIG_CMD_BLOBGEN is not set +# CONFIG_CMD_LOGIN is not set +# end of Security + # # Miscellaneous # # CONFIG_CMD_2048 is not set CONFIG_CMD_BAREBOX_UPDATE=y -# CONFIG_CMD_BLOBGEN is not set # CONFIG_CMD_FIRMWARELOAD is not set # CONFIG_CMD_KALLSYMS is not set # CONFIG_CMD_OF_COMPATIBLE is not set @@ -491,17 +510,18 @@ CONFIG_CMD_TIME=y # end of Commands CONFIG_NET=y -CONFIG_NET_NFS=y # CONFIG_NET_NETCONSOLE is not set CONFIG_NET_RESOLV=y CONFIG_NET_IFUP=y CONFIG_NET_DHCP=y # CONFIG_NET_SNTP is not set CONFIG_NET_FASTBOOT=y +# CONFIG_NET_9P is not set # # Drivers # +# CONFIG_DEEP_PROBE_DEFAULT is not set CONFIG_REGMAP_FORMATTED=y CONFIG_REGMAP_I2C=y CONFIG_REGMAP_SPI=y @@ -554,6 +574,7 @@ CONFIG_DRIVER_NET_MICREL=y # # MII PHY device drivers # +# CONFIG_ADIN_PHY is not set # CONFIG_AR8327N_PHY is not set # CONFIG_AT803X_PHY is not set # CONFIG_DAVICOM_PHY is not set @@ -676,6 +697,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_GENERAL_EXTRA_CHECKS is not set CONFIG_DISK=y CONFIG_DISK_WRITE=y +# CONFIG_DM_BLK is not set # # drive types @@ -703,7 +725,7 @@ CONFIG_USB_OHCI_AT91=y # USB Miscellaneous drivers # # CONFIG_USB_HUB_USB251XB is not set -# CONFIG_USB_ONBOARD_HUB is not set +# CONFIG_USB_ONBOARD_DEV is not set # CONFIG_TYPEC_TUSB320 is not set CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DUALSPEED=y @@ -727,12 +749,15 @@ CONFIG_MCI=y # --- Feature list --- # # CONFIG_MCI_TUNING is not set +CONFIG_MCI_STARTUP_NONE=y +# CONFIG_MCI_STARTUP_NONREMOVABLE is not set # CONFIG_MCI_STARTUP is not set CONFIG_MCI_INFO=y CONFIG_MCI_WRITE=y CONFIG_MCI_ERASE=y CONFIG_MCI_MMC_BOOT_PARTITIONS=y # CONFIG_MCI_MMC_GPP_PARTITIONS is not set +# CONFIG_MCI_MMC_RPMB is not set # # --- MCI host drivers --- @@ -747,6 +772,7 @@ CONFIG_MCI_ATMEL_SDHCI=y # CONFIG_MCI_ARASAN is not set # CONFIG_MCI_AM654 is not set # CONFIG_MCI_SPI is not set +# CONFIG_MMC_CADENCE_SDHCI is not set CONFIG_MCI_ATMEL_PBL=y CONFIG_HAVE_CLK=y CONFIG_CLKDEV_LOOKUP=y @@ -795,7 +821,7 @@ CONFIG_MFD_ATMEL_SMC=y # CONFIG_SRAM is not set CONFIG_DEV_MEM=y # CONFIG_UBOOTVAR is not set -# CONFIG_STORAGE_BY_UUID is not set +# CONFIG_STORAGE_BY_ALIAS is not set # end of Misc devices CONFIG_LED=y @@ -896,6 +922,15 @@ CONFIG_REGULATOR_FIXED=y # end of Remoteproc drivers # CONFIG_RESET_CONTROLLER is not set +CONFIG_HW_HAS_PCI=y + +# +# PCI bus options +# +# CONFIG_PCI is not set +# CONFIG_PCI_ECAM_GENERIC is not set +# end of PCI bus options + # CONFIG_RTC_CLASS is not set # @@ -977,6 +1012,7 @@ CONFIG_VIRTIO_MENU=y CONFIG_FS=y CONFIG_FS_LEGACY=y CONFIG_FS_WRITABLE=y +CONFIG_NETFS_SUPPORT=y # # Some selected filesystems still use the legacy FS API. @@ -1025,8 +1061,93 @@ CONFIG_FS_UBIFS_COMPRESSION_ZSTD=y # # ZSTD support disabled # +# CONFIG_FS_QEMU_FW_CFG is not set # end of Filesystem support +# +# Security options +# +CONFIG_INSECURE=y +# CONFIG_SECURITY_POLICY is not set +# CONFIG_PASSWORD is not set +# CONFIG_CRYPTO_KEYSTORE is not set +# CONFIG_BLOBGEN is not set + +# +# OP-TEE loading +# +# CONFIG_BOOTM_OPTEE is not set +# CONFIG_PBL_OPTEE is not set +# end of OP-TEE loading + +# +# Hardening options +# +# CONFIG_BUG_ON_DATA_CORRUPTION is not set + +# +# Memory initialization +# +CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y +# CONFIG_INIT_STACK_NONE is not set +# CONFIG_INIT_STACK_ALL_PATTERN is not set +CONFIG_INIT_STACK_ALL_ZERO=y +# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set +CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y +# CONFIG_ZERO_CALL_USED_REGS is not set +# end of Memory initialization + +# +# Buffer overflow protection +# +CONFIG_STACK_GUARD_PAGE=y +CONFIG_STACKPROTECTOR_NONE=y +# CONFIG_STACKPROTECTOR_STRONG is not set +CONFIG_PBL_STACKPROTECTOR_NONE=y +# CONFIG_PBL_STACKPROTECTOR_STRONG is not set +# end of Buffer overflow protection +# end of Hardening options + +CONFIG_HAS_INSECURE_DEFAULTS=y + +# +# This barebox configuration has CONFIG_HAS_INSECURE_DEFAULTS=y indicating +# + +# +# that some of the configured options have potentially insecure defaults. +# + +# +# Extra care needs to be taken in secure booted systems. +# +# end of Security options + +# +# Crypto support +# +CONFIG_CRC32=y +CONFIG_DIGEST=y +CONFIG_HAVE_DIGEST_MD5=y +CONFIG_HAVE_DIGEST_SHA1=y +# CONFIG_DIGEST_CRC32_GENERIC is not set +CONFIG_DIGEST_MD5_GENERIC=y +CONFIG_DIGEST_SHA1_GENERIC=y +# CONFIG_DIGEST_SHA224_GENERIC is not set +# CONFIG_DIGEST_SHA256_GENERIC is not set +# CONFIG_DIGEST_SHA384_GENERIC is not set +# CONFIG_DIGEST_SHA512_GENERIC is not set +# CONFIG_DIGEST_HMAC_GENERIC is not set +CONFIG_DIGEST_SHA1_ARM=y +# CONFIG_DIGEST_SHA256_ARM is not set +# CONFIG_CRYPTO_RSA is not set +# CONFIG_CRYPTO_ECDSA is not set +# CONFIG_CRYPTO_BUILTIN_KEYS is not set +# end of Crypto support + # # Library routines # @@ -1053,6 +1174,7 @@ CONFIG_LIBFDT=y # CONFIG_ALLOW_PRNG_FALLBACK is not set # CONFIG_CRC_CCITT is not set # CONFIG_CRC8 is not set +# CONFIG_CRC16 is not set # # Library gui routines @@ -1061,75 +1183,9 @@ CONFIG_LIBFDT=y CONFIG_PRINTF_UUID=y CONFIG_NLS=y -# CONFIG_BLOBGEN is not set -CONFIG_ARCH_HAS_STACK_DUMP=y -CONFIG_ARCH_HAS_DATA_ABORT_MASK=y -CONFIG_ARCH_HAS_ZERO_PAGE=y CONFIG_GENERIC_ALLOCATOR=y # end of Library routines -# -# Hardening options -# - -# -# This barebox configuration has CONFIG_HAS_INSECURE_DEFAULTS=y indicating -# - -# -# that some of the configured options have potentially insecure defaults. -# - -# -# Extra care needs to be in secure booted systems. -# -# CONFIG_BUG_ON_DATA_CORRUPTION is not set - -# -# Memory initialization -# -CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y -# CONFIG_INIT_STACK_NONE is not set -# CONFIG_INIT_STACK_ALL_PATTERN is not set -CONFIG_INIT_STACK_ALL_ZERO=y -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set -# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set -CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y -# CONFIG_ZERO_CALL_USED_REGS is not set -# end of Memory initialization - -CONFIG_STACK_GUARD_PAGE=y -CONFIG_STACKPROTECTOR_NONE=y -# CONFIG_STACKPROTECTOR_STRONG is not set -CONFIG_PBL_STACKPROTECTOR_NONE=y -# CONFIG_PBL_STACKPROTECTOR_STRONG is not set -# end of Hardening options - -# -# Crypto support -# -CONFIG_CRC32=y -CONFIG_DIGEST=y -CONFIG_HAVE_DIGEST_MD5=y -CONFIG_HAVE_DIGEST_SHA1=y -# CONFIG_DIGEST_CRC32_GENERIC is not set -CONFIG_DIGEST_MD5_GENERIC=y -CONFIG_DIGEST_SHA1_GENERIC=y -# CONFIG_DIGEST_SHA224_GENERIC is not set -# CONFIG_DIGEST_SHA256_GENERIC is not set -# CONFIG_DIGEST_SHA384_GENERIC is not set -# CONFIG_DIGEST_SHA512_GENERIC is not set -# CONFIG_DIGEST_HMAC_GENERIC is not set -CONFIG_DIGEST_SHA1_ARM=y -# CONFIG_DIGEST_SHA256_ARM is not set -# CONFIG_CRYPTO_RSA is not set -# CONFIG_CRYPTO_ECDSA is not set -# CONFIG_CRYPTO_BUILTIN_KEYS is not set -# CONFIG_CRYPTO_KEYSTORE is not set -# end of Crypto support - # # Firmware files # diff --git a/configs/platform-v7a_noneon/barebox-at91.config.diff b/configs/platform-v7a_noneon/barebox-at91.config.diff index 85d5349..a4a2996 100644 --- a/configs/platform-v7a_noneon/barebox-at91.config.diff +++ b/configs/platform-v7a_noneon/barebox-at91.config.diff @@ -1,5 +1,5 @@ -6f44517b962a1e868fa0f03b89d5c450 -9c961b64873047307df764511e587103 +93f609b06d41c861931fd2c0592a536f +104ee59d52fec1bfcec398bb406c648b CONFIG_ARCH_AT91=y # CONFIG_ARCH_BCM283X is not set # CONFIG_ARCH_IMX is undefined @@ -7,12 +7,13 @@ CONFIG_ARCH_AT91=y # CONFIG_ARCH_MULTIARCH is not set # CONFIG_ARCH_OMAP_MULTI is undefined # CONFIG_ARCH_ROCKCHIP is undefined +# CONFIG_ARCH_SAMSUNG is undefined # CONFIG_ARCH_SUNXI is undefined # CONFIG_ARM_SECURE_MONITOR is undefined # CONFIG_ARM_SMCCC is undefined CONFIG_AT91SAM9_SMC=y -CONFIG_AT91_MCI_PBL=y CONFIG_AT91_MULTI_BOARDS=y +CONFIG_AT91_PBL=y CONFIG_ATMEL_EBI=y CONFIG_BCH=y CONFIG_BITREV=y @@ -118,6 +119,7 @@ CONFIG_MCI_ATMEL_SDHCI=y CONFIG_MCI_MMC_BOOT_PARTITIONS=y CONFIG_MCI_SDHCI=y # CONFIG_MCI_STARTUP is not set +CONFIG_MCI_STARTUP_NONE=y # CONFIG_MEMTEST is undefined # CONFIG_MENUTREE is undefined CONFIG_MFD_ATMEL_SMC=y diff --git a/configs/platform-v7a_noneon/barebox-common.config b/configs/platform-v7a_noneon/barebox-common.config index f87b574..f5bb978 100644 --- a/configs/platform-v7a_noneon/barebox-common.config +++ b/configs/platform-v7a_noneon/barebox-common.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2025.03.0 Configuration +# Barebox/arm 2025.11.0 Configuration # CONFIG_ARM=y CONFIG_ARCH_LINUX_NAME="arm" @@ -28,6 +28,7 @@ CONFIG_ARCH_BCM283X=y # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_OMAP_MULTI is not set # CONFIG_ARCH_ROCKCHIP is not set +# CONFIG_ARCH_SAMSUNG is not set # CONFIG_ARCH_STM32MP is not set # CONFIG_ARCH_VERSATILE is not set # CONFIG_ARCH_VEXPRESS is not set @@ -59,7 +60,6 @@ CONFIG_MACH_RPI3=y CONFIG_BOARD_ARM_GENERIC_DT=y CONFIG_AEABI=y # CONFIG_THUMB2_BAREBOX is not set -# CONFIG_ARM_BOARD_APPEND_ATAG is not set # end of System Type # CONFIG_64BIT is not set @@ -70,15 +70,18 @@ CONFIG_32BIT=y # CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_EXCEPTIONS=y +# CONFIG_ARM_EXCEPTIONS_PBL is not set CONFIG_ARM_UNWIND=y +CONFIG_ARM_MMU_PERMISSIONS=y # CONFIG_ARM_SEMIHOSTING is not set CONFIG_ARM_SMCCC=y CONFIG_ARM_SECURE_MONITOR=y # CONFIG_ARM_PSCI_CLIENT is not set +# CONFIG_BOOT_ATAGS is not set +# CONFIG_ARM_BOOTM_ELF is not set +# CONFIG_ARM_BOOTM_FIP is not set # end of ARM specific settings -CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y - # # General architecture-dependent options # @@ -86,15 +89,23 @@ CONFIG_BOARD_GENERIC_DT=y # CONFIG_BOARD_GENERIC_FIT is not set # end of General architecture-dependent options +CONFIG_ARCH_HAS_DMA_WRITE_COMBINE=y +CONFIG_ARCH_HAS_STACK_DUMP=y +CONFIG_ARCH_HAS_DATA_ABORT_MASK=y +CONFIG_ARCH_HAS_ZERO_PAGE=y +CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y +CONFIG_HAVE_ARCH_BOOTM_OFTREE=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_ARCH_HAS_SJLJ=y +CONFIG_HAS_DEBUG_LL=y +CONFIG_HAVE_ARCH_KASAN=y CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=140201 CONFIG_CLANG_VERSION=0 CONFIG_GREGORIAN_CALENDER=y CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y -CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y -CONFIG_ARCH_HAS_SJLJ=y CONFIG_GENERIC_GPIO=y CONFIG_BLOCK=y CONFIG_BLOCK_WRITE=y @@ -103,6 +114,7 @@ CONFIG_BINFMT=y CONFIG_UIMAGE=y CONFIG_LOGBUF=y CONFIG_STDDEV=y +CONFIG_CDEV_ALIAS=y CONFIG_MENUTREE=y CONFIG_BOOT=y CONFIG_FASTBOOT_BASE=y @@ -110,10 +122,9 @@ CONFIG_FASTBOOT_BASE=y # # General Settings # +CONFIG_NAME="" CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y -CONFIG_HAS_INSECURE_DEFAULTS=y -CONFIG_INSECURE=y CONFIG_BANNER=y CONFIG_MEMINFO=y CONFIG_MEMTEST=y @@ -144,18 +155,18 @@ CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff CONFIG_STACK_SIZE=0x8000 CONFIG_MALLOC_SIZE=0x0 +CONFIG_SCRATCH_SIZE=0x8000 CONFIG_MALLOC_ALIGNMENT=8 # end of memory layout # CONFIG_EXPERIMENTAL is not set -# CONFIG_MALLOC_DLMALLOC is not set CONFIG_MALLOC_TLSF=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_KALLSYMS=y CONFIG_RELOCATABLE=y # CONFIG_PANIC_POWEROFF is not set # CONFIG_PANIC_HANG is not set CONFIG_PANIC_RESET=y +# CONFIG_PANIC_TRAP is not set CONFIG_PROMPT="barebox>" CONFIG_BAUDRATE=115200 CONFIG_CBSIZE=1024 @@ -170,7 +181,6 @@ CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y -# CONFIG_PASSWORD is not set CONFIG_ERRNO_MESSAGES=y CONFIG_TIMESTAMP=y CONFIG_BOOTM=y @@ -179,13 +189,14 @@ CONFIG_BOOTM_SHOW_TYPE=y CONFIG_BOOTM_VERBOSE=y CONFIG_BOOTM_INITRD=y CONFIG_BOOTM_OFTREE=y +# CONFIG_BOOTM_OFTREE_FALLBACK is not set # CONFIG_BOOTM_UIMAGE is not set # CONFIG_BOOTM_AIMAGE is not set -# CONFIG_BOOTM_ELF is not set # CONFIG_BOOTM_FITIMAGE is not set CONFIG_BOOTM_OPTIONAL_SIGNED_IMAGES=y CONFIG_BLSPEC=y CONFIG_FLEXIBLE_BOOTARGS=y +CONFIG_ROOTWAIT_BOOTARG=y CONFIG_MMCBLKDEV_ROOTARG=y CONFIG_BAREBOX_UPDATE=y # CONFIG_SYSTEM_PARTITIONS is not set @@ -217,22 +228,21 @@ CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" CONFIG_HAS_SCHED=y CONFIG_POLLER=y +CONFIG_POLLER_WARN_OVERTIME=y CONFIG_BTHREAD=y +# CONFIG_TLV is not set CONFIG_STATE=y # CONFIG_STATE_CRYPTO is not set # CONFIG_STATE_BACKWARD_COMPATIBLE is not set # CONFIG_BOOTCHOOSER is not set +CONFIG_BOOT_DEFAULTS=y +CONFIG_BAREBOX_DT_2ND=y CONFIG_RESET_SOURCE=y # CONFIG_MACHINE_ID is not set +# CONFIG_SERIAL_NUMBER_FIXUP_SYSTEMD_HOSTNAME is not set # CONFIG_SYSTEMD_OF_WATCHDOG is not set CONFIG_EXTERNAL_DTS_FRAGMENTS="" - -# -# OP-TEE loading -# -# CONFIG_BOOTM_OPTEE is not set -# CONFIG_PBL_OPTEE is not set -# end of OP-TEE loading +CONFIG_FILETYPE_STRINGS=y # # Android Fastboot @@ -247,7 +257,6 @@ CONFIG_FASTBOOT_CMD_OEM=y # CONFIG_COMPILE_LOGLEVEL=7 CONFIG_DEFAULT_LOGLEVEL=6 -CONFIG_HAS_DEBUG_LL=y # CONFIG_DEBUG_LL is not set # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PROBES is not set @@ -257,7 +266,6 @@ CONFIG_HAS_DEBUG_LL=y # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set -CONFIG_HAVE_ARCH_KASAN=y CONFIG_CC_HAS_KASAN_GENERIC=y # CONFIG_KASAN is not set # CONFIG_COMPILE_TEST is not set @@ -300,7 +308,9 @@ CONFIG_CMD_MEMINFO=y CONFIG_CMD_ARM_MMUINFO=y # CONFIG_CMD_BLKSTATS is not set CONFIG_CMD_REGULATOR=y +# CONFIG_CMD_VARINFO is not set CONFIG_CMD_VERSION=y +# CONFIG_CMD_BFETCH is not set CONFIG_CMD_MMC=y # CONFIG_CMD_MMC_EXTCSD is not set # CONFIG_CMD_POLLER is not set @@ -337,6 +347,7 @@ CONFIG_CMD_UMOUNT=y # # Environment # +# CONFIG_CMD_CREATENV is not set CONFIG_CMD_NV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_DEFAULTENV=y @@ -362,6 +373,7 @@ CONFIG_CMD_DIRNAME=y CONFIG_CMD_FILETYPE=y CONFIG_CMD_LN=y CONFIG_CMD_LS=y +CONFIG_CMD_TREE=y # CONFIG_CMD_STAT is not set CONFIG_CMD_MD5SUM=y CONFIG_CMD_MKDIR=y @@ -372,6 +384,7 @@ CONFIG_CMD_RMDIR=y CONFIG_CMD_SHA1SUM=y # CONFIG_CMD_SHA224SUM is not set # CONFIG_CMD_SHA256SUM is not set +# CONFIG_CMD_BASE64 is not set # CONFIG_CMD_SHA384SUM is not set # CONFIG_CMD_SHA512SUM is not set # CONFIG_CMD_FIPTOOL is not set @@ -400,6 +413,7 @@ CONFIG_NET_CMD_IFUP=y # CONFIG_CMD_MIITOOL is not set CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y +# CONFIG_CMD_IP is not set CONFIG_CMD_IP_ROUTE_GET=y # CONFIG_CMD_ETHLOG is not set # end of Network @@ -411,7 +425,6 @@ CONFIG_CMD_CLEAR=y CONFIG_CMD_ECHO=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_EDIT=y -# CONFIG_CMD_LOGIN is not set CONFIG_CMD_MENU=y # CONFIG_CMD_MENU_MANAGEMENT is not set CONFIG_CMD_MENUTREE=y @@ -439,6 +452,7 @@ CONFIG_CMD_MW=y # CONFIG_CMD_CLK=y CONFIG_CMD_DETECT=y +# CONFIG_CMD_TRUNCATE is not set # CONFIG_CMD_SYNC is not set CONFIG_CMD_FLASH=y CONFIG_CMD_GPIO=y @@ -454,12 +468,18 @@ CONFIG_CMD_WD=y CONFIG_CMD_WD_DEFAULT_TIMOUT=0 # end of Hardware manipulation +# +# Security +# +# CONFIG_CMD_BLOBGEN is not set +# CONFIG_CMD_LOGIN is not set +# end of Security + # # Miscellaneous # # CONFIG_CMD_2048 is not set CONFIG_CMD_BAREBOX_UPDATE=y -# CONFIG_CMD_BLOBGEN is not set # CONFIG_CMD_FIRMWARELOAD is not set # CONFIG_CMD_KALLSYMS is not set # CONFIG_CMD_OF_COMPATIBLE is not set @@ -484,17 +504,18 @@ CONFIG_CMD_STATE=y # end of Commands CONFIG_NET=y -CONFIG_NET_NFS=y # CONFIG_NET_NETCONSOLE is not set CONFIG_NET_RESOLV=y CONFIG_NET_IFUP=y CONFIG_NET_DHCP=y # CONFIG_NET_SNTP is not set CONFIG_NET_FASTBOOT=y +# CONFIG_NET_9P is not set # # Drivers # +# CONFIG_DEEP_PROBE_DEFAULT is not set CONFIG_OFTREE=y CONFIG_OFTREE_MEM_GENERIC=y CONFIG_DTC=y @@ -542,6 +563,7 @@ CONFIG_PHYLIB=y # # MII PHY device drivers # +# CONFIG_ADIN_PHY is not set # CONFIG_AR8327N_PHY is not set # CONFIG_AT803X_PHY is not set # CONFIG_DAVICOM_PHY is not set @@ -634,6 +656,7 @@ CONFIG_MTD_OOB_DEVICE=y # CONFIG_MTD_UBI is not set CONFIG_DISK=y CONFIG_DISK_WRITE=y +# CONFIG_DM_BLK is not set # # drive types @@ -659,7 +682,7 @@ CONFIG_USB_STORAGE=y # USB Miscellaneous drivers # # CONFIG_USB_HUB_USB251XB is not set -# CONFIG_USB_ONBOARD_HUB is not set +# CONFIG_USB_ONBOARD_DEV is not set # CONFIG_TYPEC_TUSB320 is not set CONFIG_USB_GADGET=y CONFIG_USB_GADGET_AUTOSTART=y @@ -680,12 +703,15 @@ CONFIG_MCI=y # --- Feature list --- # # CONFIG_MCI_TUNING is not set +# CONFIG_MCI_STARTUP_NONE is not set +# CONFIG_MCI_STARTUP_NONREMOVABLE is not set CONFIG_MCI_STARTUP=y CONFIG_MCI_INFO=y CONFIG_MCI_WRITE=y CONFIG_MCI_ERASE=y # CONFIG_MCI_MMC_BOOT_PARTITIONS is not set # CONFIG_MCI_MMC_GPP_PARTITIONS is not set +# CONFIG_MCI_MMC_RPMB is not set # # --- MCI host drivers --- @@ -700,6 +726,7 @@ CONFIG_MCI_MMCI=y # CONFIG_MCI_ARASAN is not set # CONFIG_MCI_AM654 is not set # CONFIG_MCI_SPI is not set +# CONFIG_MMC_CADENCE_SDHCI is not set CONFIG_HAVE_CLK=y CONFIG_CLKDEV_LOOKUP=y CONFIG_COMMON_CLK=y @@ -747,7 +774,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y CONFIG_STATE_DRV=y CONFIG_DEV_MEM=y # CONFIG_UBOOTVAR is not set -# CONFIG_STORAGE_BY_UUID is not set +# CONFIG_STORAGE_BY_ALIAS is not set # end of Misc devices CONFIG_LED=y @@ -840,6 +867,15 @@ CONFIG_REGULATOR_BCM283X=y # end of Remoteproc drivers # CONFIG_RESET_CONTROLLER is not set +CONFIG_HW_HAS_PCI=y + +# +# PCI bus options +# +# CONFIG_PCI is not set +# CONFIG_PCI_ECAM_GENERIC is not set +# end of PCI bus options + # CONFIG_RTC_CLASS is not set # @@ -918,6 +954,7 @@ CONFIG_REGULATOR_BCM283X=y CONFIG_FS=y CONFIG_FS_LEGACY=y CONFIG_FS_WRITABLE=y +CONFIG_NETFS_SUPPORT=y # # Some selected filesystems still use the legacy FS API. @@ -962,8 +999,93 @@ CONFIG_FS_FAT_LFN=y # # ZSTD support disabled # +# CONFIG_FS_QEMU_FW_CFG is not set # end of Filesystem support +# +# Security options +# +CONFIG_INSECURE=y +# CONFIG_SECURITY_POLICY is not set +# CONFIG_PASSWORD is not set +# CONFIG_CRYPTO_KEYSTORE is not set +# CONFIG_BLOBGEN is not set + +# +# OP-TEE loading +# +# CONFIG_BOOTM_OPTEE is not set +# CONFIG_PBL_OPTEE is not set +# end of OP-TEE loading + +# +# Hardening options +# +# CONFIG_BUG_ON_DATA_CORRUPTION is not set + +# +# Memory initialization +# +CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y +# CONFIG_INIT_STACK_NONE is not set +# CONFIG_INIT_STACK_ALL_PATTERN is not set +CONFIG_INIT_STACK_ALL_ZERO=y +# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set +CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y +# CONFIG_ZERO_CALL_USED_REGS is not set +# end of Memory initialization + +# +# Buffer overflow protection +# +CONFIG_STACK_GUARD_PAGE=y +CONFIG_STACKPROTECTOR_NONE=y +# CONFIG_STACKPROTECTOR_STRONG is not set +CONFIG_PBL_STACKPROTECTOR_NONE=y +# CONFIG_PBL_STACKPROTECTOR_STRONG is not set +# end of Buffer overflow protection +# end of Hardening options + +CONFIG_HAS_INSECURE_DEFAULTS=y + +# +# This barebox configuration has CONFIG_HAS_INSECURE_DEFAULTS=y indicating +# + +# +# that some of the configured options have potentially insecure defaults. +# + +# +# Extra care needs to be taken in secure booted systems. +# +# end of Security options + +# +# Crypto support +# +CONFIG_CRC32=y +CONFIG_DIGEST=y +CONFIG_HAVE_DIGEST_MD5=y +CONFIG_HAVE_DIGEST_SHA1=y +# CONFIG_DIGEST_CRC32_GENERIC is not set +CONFIG_DIGEST_MD5_GENERIC=y +CONFIG_DIGEST_SHA1_GENERIC=y +# CONFIG_DIGEST_SHA224_GENERIC is not set +# CONFIG_DIGEST_SHA256_GENERIC is not set +# CONFIG_DIGEST_SHA384_GENERIC is not set +# CONFIG_DIGEST_SHA512_GENERIC is not set +# CONFIG_DIGEST_HMAC_GENERIC is not set +# CONFIG_DIGEST_SHA1_ARM is not set +# CONFIG_DIGEST_SHA256_ARM is not set +# CONFIG_CRYPTO_RSA is not set +# CONFIG_CRYPTO_ECDSA is not set +# CONFIG_CRYPTO_BUILTIN_KEYS is not set +# end of Crypto support + # # Library routines # @@ -992,6 +1114,7 @@ CONFIG_LIBFDT=y # CONFIG_ALLOW_PRNG_FALLBACK is not set # CONFIG_CRC_CCITT is not set # CONFIG_CRC8 is not set +# CONFIG_CRC16 is not set # # Library gui routines @@ -1000,74 +1123,8 @@ CONFIG_LIBFDT=y CONFIG_PRINTF_UUID=y CONFIG_NLS=y -# CONFIG_BLOBGEN is not set -CONFIG_ARCH_HAS_STACK_DUMP=y -CONFIG_ARCH_HAS_DATA_ABORT_MASK=y -CONFIG_ARCH_HAS_ZERO_PAGE=y # end of Library routines -# -# Hardening options -# - -# -# This barebox configuration has CONFIG_HAS_INSECURE_DEFAULTS=y indicating -# - -# -# that some of the configured options have potentially insecure defaults. -# - -# -# Extra care needs to be in secure booted systems. -# -# CONFIG_BUG_ON_DATA_CORRUPTION is not set - -# -# Memory initialization -# -CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y -# CONFIG_INIT_STACK_NONE is not set -# CONFIG_INIT_STACK_ALL_PATTERN is not set -CONFIG_INIT_STACK_ALL_ZERO=y -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set -# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set -CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y -# CONFIG_ZERO_CALL_USED_REGS is not set -# end of Memory initialization - -CONFIG_STACK_GUARD_PAGE=y -CONFIG_STACKPROTECTOR_NONE=y -# CONFIG_STACKPROTECTOR_STRONG is not set -CONFIG_PBL_STACKPROTECTOR_NONE=y -# CONFIG_PBL_STACKPROTECTOR_STRONG is not set -# end of Hardening options - -# -# Crypto support -# -CONFIG_CRC32=y -CONFIG_DIGEST=y -CONFIG_HAVE_DIGEST_MD5=y -CONFIG_HAVE_DIGEST_SHA1=y -# CONFIG_DIGEST_CRC32_GENERIC is not set -CONFIG_DIGEST_MD5_GENERIC=y -CONFIG_DIGEST_SHA1_GENERIC=y -# CONFIG_DIGEST_SHA224_GENERIC is not set -# CONFIG_DIGEST_SHA256_GENERIC is not set -# CONFIG_DIGEST_SHA384_GENERIC is not set -# CONFIG_DIGEST_SHA512_GENERIC is not set -# CONFIG_DIGEST_HMAC_GENERIC is not set -# CONFIG_DIGEST_SHA1_ARM is not set -# CONFIG_DIGEST_SHA256_ARM is not set -# CONFIG_CRYPTO_RSA is not set -# CONFIG_CRYPTO_ECDSA is not set -# CONFIG_CRYPTO_BUILTIN_KEYS is not set -# CONFIG_CRYPTO_KEYSTORE is not set -# end of Crypto support - # # Firmware files # diff --git a/configs/platform-v7a_noneon/barebox-vexpress.config b/configs/platform-v7a_noneon/barebox-vexpress.config index ca983af..9cee673 100644 --- a/configs/platform-v7a_noneon/barebox-vexpress.config +++ b/configs/platform-v7a_noneon/barebox-vexpress.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2025.03.0 Configuration +# Barebox/arm 2025.11.0 Configuration # CONFIG_ARM=y CONFIG_ARCH_LINUX_NAME="arm" @@ -28,6 +28,7 @@ CONFIG_ARCH_MULTIARCH=y # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_OMAP_MULTI is not set # CONFIG_ARCH_ROCKCHIP is not set +# CONFIG_ARCH_SAMSUNG is not set # CONFIG_ARCH_STM32MP is not set # CONFIG_ARCH_VERSATILE is not set CONFIG_ARCH_VEXPRESS=y @@ -48,7 +49,6 @@ CONFIG_MACH_VEXPRESS=y CONFIG_BOARD_ARM_GENERIC_DT=y CONFIG_AEABI=y # CONFIG_THUMB2_BAREBOX is not set -# CONFIG_ARM_BOARD_APPEND_ATAG is not set # end of System Type # CONFIG_64BIT is not set @@ -59,13 +59,16 @@ CONFIG_32BIT=y # CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_EXCEPTIONS=y +# CONFIG_ARM_EXCEPTIONS_PBL is not set CONFIG_ARM_UNWIND=y +CONFIG_ARM_MMU_PERMISSIONS=y # CONFIG_ARM_SEMIHOSTING is not set # CONFIG_ARM_PSCI_CLIENT is not set +# CONFIG_BOOT_ATAGS is not set +# CONFIG_ARM_BOOTM_ELF is not set +# CONFIG_ARM_BOOTM_FIP is not set # end of ARM specific settings -CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y - # # General architecture-dependent options # @@ -73,15 +76,23 @@ CONFIG_BOARD_GENERIC_DT=y # CONFIG_BOARD_GENERIC_FIT is not set # end of General architecture-dependent options +CONFIG_ARCH_HAS_DMA_WRITE_COMBINE=y +CONFIG_ARCH_HAS_STACK_DUMP=y +CONFIG_ARCH_HAS_DATA_ABORT_MASK=y +CONFIG_ARCH_HAS_ZERO_PAGE=y +CONFIG_HAVE_ARCH_BOARD_GENERIC_DT=y +CONFIG_HAVE_ARCH_BOOTM_OFTREE=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_ARCH_HAS_SJLJ=y +CONFIG_HAS_DEBUG_LL=y +CONFIG_HAVE_ARCH_KASAN=y CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=140201 CONFIG_CLANG_VERSION=0 CONFIG_GREGORIAN_CALENDER=y CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y -CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y -CONFIG_ARCH_HAS_SJLJ=y CONFIG_BLOCK=y CONFIG_BLOCK_WRITE=y CONFIG_FILETYPE=y @@ -89,6 +100,7 @@ CONFIG_BINFMT=y CONFIG_UIMAGE=y CONFIG_LOGBUF=y CONFIG_STDDEV=y +CONFIG_CDEV_ALIAS=y CONFIG_MENUTREE=y CONFIG_BOOT=y CONFIG_FASTBOOT_BASE=y @@ -96,10 +108,9 @@ CONFIG_FASTBOOT_BASE=y # # General Settings # +CONFIG_NAME="" CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y -CONFIG_HAS_INSECURE_DEFAULTS=y -CONFIG_INSECURE=y CONFIG_BANNER=y CONFIG_MEMINFO=y CONFIG_MEMTEST=y @@ -130,18 +141,18 @@ CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff CONFIG_STACK_SIZE=0x8000 CONFIG_MALLOC_SIZE=0x0 +CONFIG_SCRATCH_SIZE=0x8000 CONFIG_MALLOC_ALIGNMENT=8 # end of memory layout # CONFIG_EXPERIMENTAL is not set -# CONFIG_MALLOC_DLMALLOC is not set CONFIG_MALLOC_TLSF=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_KALLSYMS=y CONFIG_RELOCATABLE=y # CONFIG_PANIC_POWEROFF is not set # CONFIG_PANIC_HANG is not set CONFIG_PANIC_RESET=y +# CONFIG_PANIC_TRAP is not set CONFIG_PROMPT="vexpress: " CONFIG_BAUDRATE=115200 CONFIG_CBSIZE=1024 @@ -156,7 +167,6 @@ CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y -# CONFIG_PASSWORD is not set CONFIG_ERRNO_MESSAGES=y CONFIG_TIMESTAMP=y CONFIG_BOOTM=y @@ -165,13 +175,14 @@ CONFIG_BOOTM_SHOW_TYPE=y CONFIG_BOOTM_VERBOSE=y CONFIG_BOOTM_INITRD=y CONFIG_BOOTM_OFTREE=y +# CONFIG_BOOTM_OFTREE_FALLBACK is not set # CONFIG_BOOTM_UIMAGE is not set # CONFIG_BOOTM_AIMAGE is not set -# CONFIG_BOOTM_ELF is not set # CONFIG_BOOTM_FITIMAGE is not set CONFIG_BOOTM_OPTIONAL_SIGNED_IMAGES=y CONFIG_BLSPEC=y CONFIG_FLEXIBLE_BOOTARGS=y +CONFIG_ROOTWAIT_BOOTARG=y CONFIG_MMCBLKDEV_ROOTARG=y CONFIG_BAREBOX_UPDATE=y # CONFIG_SYSTEM_PARTITIONS is not set @@ -203,22 +214,21 @@ CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" CONFIG_HAS_SCHED=y CONFIG_POLLER=y +CONFIG_POLLER_WARN_OVERTIME=y CONFIG_BTHREAD=y +# CONFIG_TLV is not set CONFIG_STATE=y # CONFIG_STATE_CRYPTO is not set # CONFIG_STATE_BACKWARD_COMPATIBLE is not set # CONFIG_BOOTCHOOSER is not set +CONFIG_BOOT_DEFAULTS=y +CONFIG_BAREBOX_DT_2ND=y CONFIG_RESET_SOURCE=y # CONFIG_MACHINE_ID is not set +# CONFIG_SERIAL_NUMBER_FIXUP_SYSTEMD_HOSTNAME is not set # CONFIG_SYSTEMD_OF_WATCHDOG is not set CONFIG_EXTERNAL_DTS_FRAGMENTS="" - -# -# OP-TEE loading -# -# CONFIG_BOOTM_OPTEE is not set -# CONFIG_PBL_OPTEE is not set -# end of OP-TEE loading +CONFIG_FILETYPE_STRINGS=y # # Android Fastboot @@ -233,7 +243,6 @@ CONFIG_FASTBOOT_CMD_OEM=y # CONFIG_COMPILE_LOGLEVEL=7 CONFIG_DEFAULT_LOGLEVEL=6 -CONFIG_HAS_DEBUG_LL=y # CONFIG_DEBUG_LL is not set # CONFIG_DEBUG_INITCALLS is not set # CONFIG_DEBUG_PBL is not set @@ -244,7 +253,6 @@ CONFIG_HAS_DEBUG_LL=y # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set # CONFIG_UBSAN is not set -CONFIG_HAVE_ARCH_KASAN=y CONFIG_CC_HAS_KASAN_GENERIC=y # CONFIG_KASAN is not set # CONFIG_COMPILE_TEST is not set @@ -287,7 +295,9 @@ CONFIG_CMD_MEMINFO=y CONFIG_CMD_ARM_MMUINFO=y # CONFIG_CMD_BLKSTATS is not set CONFIG_CMD_REGULATOR=y +# CONFIG_CMD_VARINFO is not set CONFIG_CMD_VERSION=y +# CONFIG_CMD_BFETCH is not set CONFIG_CMD_MMC=y # CONFIG_CMD_MMC_EXTCSD is not set # CONFIG_CMD_POLLER is not set @@ -324,6 +334,7 @@ CONFIG_CMD_UMOUNT=y # # Environment # +# CONFIG_CMD_CREATENV is not set CONFIG_CMD_NV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_DEFAULTENV=y @@ -349,6 +360,7 @@ CONFIG_CMD_DIRNAME=y CONFIG_CMD_FILETYPE=y CONFIG_CMD_LN=y CONFIG_CMD_LS=y +CONFIG_CMD_TREE=y # CONFIG_CMD_STAT is not set CONFIG_CMD_MD5SUM=y CONFIG_CMD_MKDIR=y @@ -359,6 +371,7 @@ CONFIG_CMD_RMDIR=y CONFIG_CMD_SHA1SUM=y # CONFIG_CMD_SHA224SUM is not set # CONFIG_CMD_SHA256SUM is not set +# CONFIG_CMD_BASE64 is not set # CONFIG_CMD_SHA384SUM is not set # CONFIG_CMD_SHA512SUM is not set # CONFIG_CMD_FIPTOOL is not set @@ -387,6 +400,7 @@ CONFIG_NET_CMD_IFUP=y # CONFIG_CMD_MIITOOL is not set CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y +# CONFIG_CMD_IP is not set CONFIG_CMD_IP_ROUTE_GET=y # CONFIG_CMD_ETHLOG is not set # end of Network @@ -398,7 +412,6 @@ CONFIG_CMD_CLEAR=y CONFIG_CMD_ECHO=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_EDIT=y -# CONFIG_CMD_LOGIN is not set CONFIG_CMD_MENU=y # CONFIG_CMD_MENU_MANAGEMENT is not set CONFIG_CMD_MENUTREE=y @@ -426,6 +439,7 @@ CONFIG_CMD_MW=y # CONFIG_CMD_CLK=y CONFIG_CMD_DETECT=y +# CONFIG_CMD_TRUNCATE is not set # CONFIG_CMD_SYNC is not set CONFIG_CMD_FLASH=y CONFIG_CMD_I2C=y @@ -439,12 +453,18 @@ CONFIG_CMD_WD=y CONFIG_CMD_WD_DEFAULT_TIMOUT=0 # end of Hardware manipulation +# +# Security +# +# CONFIG_CMD_BLOBGEN is not set +# CONFIG_CMD_LOGIN is not set +# end of Security + # # Miscellaneous # # CONFIG_CMD_2048 is not set CONFIG_CMD_BAREBOX_UPDATE=y -# CONFIG_CMD_BLOBGEN is not set # CONFIG_CMD_FIRMWARELOAD is not set # CONFIG_CMD_KALLSYMS is not set # CONFIG_CMD_OF_COMPATIBLE is not set @@ -469,17 +489,18 @@ CONFIG_CMD_STATE=y # end of Commands CONFIG_NET=y -CONFIG_NET_NFS=y # CONFIG_NET_NETCONSOLE is not set CONFIG_NET_RESOLV=y CONFIG_NET_IFUP=y CONFIG_NET_DHCP=y # CONFIG_NET_SNTP is not set CONFIG_NET_FASTBOOT=y +# CONFIG_NET_9P is not set # # Drivers # +# CONFIG_DEEP_PROBE_DEFAULT is not set CONFIG_OFTREE=y CONFIG_OFTREE_MEM_GENERIC=y CONFIG_DTC=y @@ -526,6 +547,7 @@ CONFIG_DRIVER_NET_SMC911X=y # # MII PHY device drivers # +# CONFIG_ADIN_PHY is not set # CONFIG_AR8327N_PHY is not set # CONFIG_AT803X_PHY is not set # CONFIG_DAVICOM_PHY is not set @@ -619,6 +641,7 @@ CONFIG_DRIVER_CFI_BANK_WIDTH_4=y # CONFIG_MTD_UBI is not set CONFIG_DISK=y CONFIG_DISK_WRITE=y +# CONFIG_DM_BLK is not set # # drive types @@ -644,7 +667,7 @@ CONFIG_USB_STORAGE=y # USB Miscellaneous drivers # # CONFIG_USB_HUB_USB251XB is not set -# CONFIG_USB_ONBOARD_HUB is not set +# CONFIG_USB_ONBOARD_DEV is not set # CONFIG_TYPEC_TUSB320 is not set CONFIG_USB_GADGET=y CONFIG_USB_GADGET_AUTOSTART=y @@ -665,12 +688,15 @@ CONFIG_MCI=y # --- Feature list --- # # CONFIG_MCI_TUNING is not set +# CONFIG_MCI_STARTUP_NONE is not set +# CONFIG_MCI_STARTUP_NONREMOVABLE is not set CONFIG_MCI_STARTUP=y CONFIG_MCI_INFO=y CONFIG_MCI_WRITE=y CONFIG_MCI_ERASE=y # CONFIG_MCI_MMC_BOOT_PARTITIONS is not set # CONFIG_MCI_MMC_GPP_PARTITIONS is not set +# CONFIG_MCI_MMC_RPMB is not set # # --- MCI host drivers --- @@ -683,6 +709,7 @@ CONFIG_MCI_MMCI=y # CONFIG_MCI_ARASAN is not set # CONFIG_MCI_AM654 is not set # CONFIG_MCI_SPI is not set +# CONFIG_MMC_CADENCE_SDHCI is not set CONFIG_HAVE_CLK=y CONFIG_CLKDEV_LOOKUP=y CONFIG_COMMON_CLK=y @@ -729,7 +756,7 @@ CONFIG_SRAM=y CONFIG_STATE_DRV=y CONFIG_DEV_MEM=y # CONFIG_UBOOTVAR is not set -# CONFIG_STORAGE_BY_UUID is not set +# CONFIG_STORAGE_BY_ALIAS is not set # end of Misc devices CONFIG_LED=y @@ -791,6 +818,15 @@ CONFIG_REGULATOR=y # end of Remoteproc drivers # CONFIG_RESET_CONTROLLER is not set +CONFIG_HW_HAS_PCI=y + +# +# PCI bus options +# +# CONFIG_PCI is not set +# CONFIG_PCI_ECAM_GENERIC is not set +# end of PCI bus options + # CONFIG_RTC_CLASS is not set # @@ -866,6 +902,7 @@ CONFIG_REGULATOR=y CONFIG_FS=y CONFIG_FS_LEGACY=y CONFIG_FS_WRITABLE=y +CONFIG_NETFS_SUPPORT=y # # Some selected filesystems still use the legacy FS API. @@ -910,8 +947,93 @@ CONFIG_FS_FAT_LFN=y # # ZSTD support disabled # +# CONFIG_FS_QEMU_FW_CFG is not set # end of Filesystem support +# +# Security options +# +CONFIG_INSECURE=y +# CONFIG_SECURITY_POLICY is not set +# CONFIG_PASSWORD is not set +# CONFIG_CRYPTO_KEYSTORE is not set +# CONFIG_BLOBGEN is not set + +# +# OP-TEE loading +# +# CONFIG_BOOTM_OPTEE is not set +# CONFIG_PBL_OPTEE is not set +# end of OP-TEE loading + +# +# Hardening options +# +# CONFIG_BUG_ON_DATA_CORRUPTION is not set + +# +# Memory initialization +# +CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y +# CONFIG_INIT_STACK_NONE is not set +# CONFIG_INIT_STACK_ALL_PATTERN is not set +CONFIG_INIT_STACK_ALL_ZERO=y +# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set +CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y +# CONFIG_ZERO_CALL_USED_REGS is not set +# end of Memory initialization + +# +# Buffer overflow protection +# +CONFIG_STACK_GUARD_PAGE=y +CONFIG_STACKPROTECTOR_NONE=y +# CONFIG_STACKPROTECTOR_STRONG is not set +CONFIG_PBL_STACKPROTECTOR_NONE=y +# CONFIG_PBL_STACKPROTECTOR_STRONG is not set +# end of Buffer overflow protection +# end of Hardening options + +CONFIG_HAS_INSECURE_DEFAULTS=y + +# +# This barebox configuration has CONFIG_HAS_INSECURE_DEFAULTS=y indicating +# + +# +# that some of the configured options have potentially insecure defaults. +# + +# +# Extra care needs to be taken in secure booted systems. +# +# end of Security options + +# +# Crypto support +# +CONFIG_CRC32=y +CONFIG_DIGEST=y +CONFIG_HAVE_DIGEST_MD5=y +CONFIG_HAVE_DIGEST_SHA1=y +# CONFIG_DIGEST_CRC32_GENERIC is not set +CONFIG_DIGEST_MD5_GENERIC=y +CONFIG_DIGEST_SHA1_GENERIC=y +# CONFIG_DIGEST_SHA224_GENERIC is not set +# CONFIG_DIGEST_SHA256_GENERIC is not set +# CONFIG_DIGEST_SHA384_GENERIC is not set +# CONFIG_DIGEST_SHA512_GENERIC is not set +# CONFIG_DIGEST_HMAC_GENERIC is not set +CONFIG_DIGEST_SHA1_ARM=y +# CONFIG_DIGEST_SHA256_ARM is not set +# CONFIG_CRYPTO_RSA is not set +# CONFIG_CRYPTO_ECDSA is not set +# CONFIG_CRYPTO_BUILTIN_KEYS is not set +# end of Crypto support + # # Library routines # @@ -940,6 +1062,7 @@ CONFIG_LIBFDT=y # CONFIG_ALLOW_PRNG_FALLBACK is not set # CONFIG_CRC_CCITT is not set # CONFIG_CRC8 is not set +# CONFIG_CRC16 is not set # # Library gui routines @@ -948,74 +1071,8 @@ CONFIG_LIBFDT=y CONFIG_PRINTF_UUID=y CONFIG_NLS=y -# CONFIG_BLOBGEN is not set -CONFIG_ARCH_HAS_STACK_DUMP=y -CONFIG_ARCH_HAS_DATA_ABORT_MASK=y -CONFIG_ARCH_HAS_ZERO_PAGE=y # end of Library routines -# -# Hardening options -# - -# -# This barebox configuration has CONFIG_HAS_INSECURE_DEFAULTS=y indicating -# - -# -# that some of the configured options have potentially insecure defaults. -# - -# -# Extra care needs to be in secure booted systems. -# -# CONFIG_BUG_ON_DATA_CORRUPTION is not set - -# -# Memory initialization -# -CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y -# CONFIG_INIT_STACK_NONE is not set -# CONFIG_INIT_STACK_ALL_PATTERN is not set -CONFIG_INIT_STACK_ALL_ZERO=y -# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set -# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set -CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y -# CONFIG_ZERO_CALL_USED_REGS is not set -# end of Memory initialization - -CONFIG_STACK_GUARD_PAGE=y -CONFIG_STACKPROTECTOR_NONE=y -# CONFIG_STACKPROTECTOR_STRONG is not set -CONFIG_PBL_STACKPROTECTOR_NONE=y -# CONFIG_PBL_STACKPROTECTOR_STRONG is not set -# end of Hardening options - -# -# Crypto support -# -CONFIG_CRC32=y -CONFIG_DIGEST=y -CONFIG_HAVE_DIGEST_MD5=y -CONFIG_HAVE_DIGEST_SHA1=y -# CONFIG_DIGEST_CRC32_GENERIC is not set -CONFIG_DIGEST_MD5_GENERIC=y -CONFIG_DIGEST_SHA1_GENERIC=y -# CONFIG_DIGEST_SHA224_GENERIC is not set -# CONFIG_DIGEST_SHA256_GENERIC is not set -# CONFIG_DIGEST_SHA384_GENERIC is not set -# CONFIG_DIGEST_SHA512_GENERIC is not set -# CONFIG_DIGEST_HMAC_GENERIC is not set -CONFIG_DIGEST_SHA1_ARM=y -# CONFIG_DIGEST_SHA256_ARM is not set -# CONFIG_CRYPTO_RSA is not set -# CONFIG_CRYPTO_ECDSA is not set -# CONFIG_CRYPTO_BUILTIN_KEYS is not set -# CONFIG_CRYPTO_KEYSTORE is not set -# end of Crypto support - # # Firmware files # diff --git a/configs/platform-v7a_noneon/barebox-vexpress.config.diff b/configs/platform-v7a_noneon/barebox-vexpress.config.diff index e2a5942..57ead0b 100644 --- a/configs/platform-v7a_noneon/barebox-vexpress.config.diff +++ b/configs/platform-v7a_noneon/barebox-vexpress.config.diff @@ -1,5 +1,5 @@ -6f44517b962a1e868fa0f03b89d5c450 -910a141ea6513b56d6c27f22e037283f +93f609b06d41c861931fd2c0592a536f +feda0633ec76b4a6a0d546d8b20a7bf2 CONFIG_AMBA_SP804=y # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_VEXPRESS=y diff --git a/configs/platform-v7a_noneon/patches/barebox-2025.03.0/0001-pinctrl-at91-add-sama5d3-compatible-after-DT-regression.patch b/configs/platform-v7a_noneon/patches/barebox-2025.03.0/0001-pinctrl-at91-add-sama5d3-compatible-after-DT-regression.patch deleted file mode 100644 index 74b11b9..0000000 --- a/configs/platform-v7a_noneon/patches/barebox-2025.03.0/0001-pinctrl-at91-add-sama5d3-compatible-after-DT-regression.patch +++ /dev/null @@ -1,41 +0,0 @@ -From a8c4a99884bded5a2951d8fc8e892b9c4d60a5f8 Mon Sep 17 00:00:00 2001 -From: Lars Schmidt <lsc@pengutronix.de> -Date: Wed, 16 Apr 2025 15:26:56 +0200 -Subject: [PATCH] pinctrl: at91: add sama5d3 compatible after DT regression - -Commit f9abec74133a6 ("ARM: dts: microchip: Remove additional compatible -string from PIO3 pinctrl nodes") removed compatible string -atmel,at91sam9x5-pinctrl, which was used by pinctrl driver for sama3d3 in -barebox. Compatible string atmel,sama5d3-pinctrl was left in list, so -that needs to be included for identification. - -The removal caused an issue during boot process. The system did still boot, -but no bootloader console was shown. Leaving the user without -possibility to interact with the bootloader. - -The DT ABI breakage has been reported upstream: - -https://lore.kernel.org/all/fcdb9283-07aa-4d50-ac4d-317b0a4e5f7e@pengutronix.de/ - -Signed-off-by: Lars Schmidt <lsc@pengutronix.de> ---- - drivers/pinctrl/pinctrl-at91.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c -index a3372a5035..ddc725187b 100644 ---- a/drivers/pinctrl/pinctrl-at91.c -+++ b/drivers/pinctrl/pinctrl-at91.c -@@ -370,6 +370,9 @@ static struct at91_pinctrl_mux_ops at91sam9x5_ops = { - - static struct of_device_id at91_pinctrl_dt_ids[] = { - { -+ .compatible = "atmel,sama5d3-pinctrl", -+ .data = &at91sam9x5_ops, -+ }, { - .compatible = "atmel,at91rm9200-pinctrl", - .data = &at91rm9200_ops, - }, { --- -2.39.5 - diff --git a/configs/platform-v7a_noneon/patches/barebox-2025.03.0/series b/configs/platform-v7a_noneon/patches/barebox-2025.03.0/series deleted file mode 100644 index 426f667..0000000 --- a/configs/platform-v7a_noneon/patches/barebox-2025.03.0/series +++ /dev/null @@ -1 +0,0 @@ -0001-pinctrl-at91-add-sama5d3-compatible-after-DT-regression.patch \ No newline at end of file diff --git a/configs/platform-v7a_noneon/platformconfig b/configs/platform-v7a_noneon/platformconfig index 8655518..360e314 100644 --- a/configs/platform-v7a_noneon/platformconfig +++ b/configs/platform-v7a_noneon/platformconfig @@ -179,8 +179,8 @@ PTXCONF_CONSOLE_SPEED="115200" # PTXCONF_AT91BOOTSTRAP2 is not set PTXCONF_BAREBOX_COMMON_ARCH_STRING="arm" PTXCONF_BAREBOX_COMMON=y -PTXCONF_BAREBOX_COMMON_VERSION="2025.03.0" -PTXCONF_BAREBOX_COMMON_MD5="2b84bcf8644373db021c86864f2e5761" +PTXCONF_BAREBOX_COMMON_VERSION="2025.11.0" +PTXCONF_BAREBOX_COMMON_MD5="867dea758c6ea8b350bac57009235e88" PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y PTXCONF_BAREBOX_AT91=y PTXCONF_BAREBOX_VEXPRESS=y -- 2.47.3 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [DistroKit] [PATCH v2 3/3] v8a: barebox: version bump 2025.07.0 -> 2025.11.0 2025-12-02 17:03 [DistroKit] [PATCH v2 0/3] Update barebox to newest version Fabian Pflug 2025-12-02 17:03 ` [DistroKit] [PATCH v2 1/3] v7a: barebox: version bump 2025.06.1 -> 2025.11.0 Fabian Pflug 2025-12-02 17:03 ` [DistroKit] [PATCH v2 2/3] v7a_noneon: barebox: version bump 2025.03.0 " Fabian Pflug @ 2025-12-02 17:03 ` Fabian Pflug 2025-12-03 17:38 ` [DistroKit] [PATCH v2 0/3] Update barebox to newest version Robert Schwebel 3 siblings, 0 replies; 5+ messages in thread From: Fabian Pflug @ 2025-12-02 17:03 UTC (permalink / raw) To: distrokit; +Cc: Fabian Pflug Updating barebox to a current version. Run oldconfig and accepting all defaults. Signed-off-by: Fabian Pflug <f.pflug@pengutronix.de> --- configs/platform-v8a/barebox.config | 166 +- ...on-deep-probe-include-of-for-of_device_id.patch | 30 - ...boards-i.MX93-Add-NXP-FRDM-i.MX93-support.patch | 2624 -------------------- .../platform-v8a/patches/barebox-2025.07.0/series | 2 - .../0001-ARM-i-MX93-reinstate-aliases.patch | 62 + .../platform-v8a/patches/barebox-2025.11.0/series | 1 + configs/platform-v8a/platformconfig | 4 +- 7 files changed, 168 insertions(+), 2721 deletions(-) diff --git a/configs/platform-v8a/barebox.config b/configs/platform-v8a/barebox.config index d0865a4..1ab047a 100644 --- a/configs/platform-v8a/barebox.config +++ b/configs/platform-v8a/barebox.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2025.07.0 Configuration +# Barebox/arm 2025.11.0 Configuration # CONFIG_ARM=y CONFIG_ARCH_LINUX_NAME="arm64" @@ -13,6 +13,7 @@ CONFIG_ARM_LINUX=y # System Type # CONFIG_ARCH_MULTIARCH=y +# CONFIG_ARCH_SOCFPGA is not set # CONFIG_ARCH_ARM64_VIRT is not set # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_IMX=y @@ -20,6 +21,7 @@ CONFIG_ARCH_K3=y # CONFIG_ARCH_SUNXI is not set # CONFIG_ARCH_LAYERSCAPE is not set CONFIG_ARCH_ROCKCHIP=y +# CONFIG_ARCH_SAMSUNG is not set # CONFIG_ARCH_ZYNQMP is not set # @@ -38,6 +40,7 @@ CONFIG_USB_GADGET_DRIVER_ARC_PBL=y CONFIG_ARCH_IMX_ATF=y CONFIG_ARCH_IMX_ROMAPI=y CONFIG_ARCH_IMX_SCRATCHMEM=y +CONFIG_ARCH_IMX_SNVS=y # # i.MX boards @@ -99,6 +102,8 @@ CONFIG_MACH_BEAGLEPLAY=y # CONFIG_MACH_AM62LX_EVM is not set # CONFIG_ARCH_K3_AUTHENTICATE_IMAGE is not set # CONFIG_ARCH_K3_COMMAND_AUTHENTICATE is not set +CONFIG_ARCH_K3_SIGNING_KEY_TI_DEVEL=y +# CONFIG_ARCH_K3_SIGNING_KEY_CUSTOM is not set # end of K3 boards # @@ -116,6 +121,7 @@ CONFIG_MACH_RK3568_EVB=y # CONFIG_MACH_PINE64_PINETAB2 is not set # CONFIG_MACH_PINE64_QUARTZ64 is not set # CONFIG_MACH_PROTONIC_MECSBC is not set +# CONFIG_MACH_PROTONIC_PRTPUK is not set CONFIG_MACH_RADXA_ROCK3=y # CONFIG_MACH_RADXA_ROCK5 is not set # CONFIG_MACH_RADXA_CM3 is not set @@ -129,6 +135,7 @@ CONFIG_ARCH_ROCKCHIP_ATF=y # CONFIG_ARCH_ROCKCHIP_ATF_PASS_FDT is not set CONFIG_ARCH_ROCKCHIP_ATF_FDT_SIZE=0x0 # CONFIG_ARCH_ROCKCHIP_OPTEE is not set +# CONFIG_ARCH_ROCKCHIP_IMAGE_SIGNED is not set # end of Rockchip Features CONFIG_BOARD_ARM_GENERIC_DT=y @@ -142,6 +149,8 @@ CONFIG_64BIT=y # CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_EXCEPTIONS=y +# CONFIG_ARM_EXCEPTIONS_PBL is not set +CONFIG_ARM_MMU_PERMISSIONS=y # CONFIG_ARM_SEMIHOSTING is not set CONFIG_ARM_SMCCC=y CONFIG_ARM_PSCI_OF=y @@ -158,6 +167,7 @@ CONFIG_BOARD_GENERIC_DT=y # CONFIG_BOARD_GENERIC_FIT is not set # end of General architecture-dependent options +CONFIG_ARCH_HAS_DMA_WRITE_COMBINE=y CONFIG_ARCH_HAS_STACK_DUMP=y CONFIG_ARCH_HAS_DATA_ABORT_MASK=y CONFIG_ARCH_HAS_ZERO_PAGE=y @@ -193,10 +203,9 @@ CONFIG_FASTBOOT_BASE=y # # General Settings # +CONFIG_NAME="" CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y -CONFIG_HAS_INSECURE_DEFAULTS=y -CONFIG_INSECURE=y CONFIG_BANNER=y CONFIG_MEMINFO=y CONFIG_MEMTEST=y @@ -239,6 +248,7 @@ CONFIG_RELOCATABLE=y # CONFIG_PANIC_POWEROFF is not set # CONFIG_PANIC_HANG is not set CONFIG_PANIC_RESET=y +# CONFIG_PANIC_TRAP is not set CONFIG_PROMPT="barebox:" CONFIG_BAUDRATE=115200 CONFIG_CBSIZE=1024 @@ -253,7 +263,6 @@ CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y -# CONFIG_PASSWORD is not set CONFIG_ERRNO_MESSAGES=y CONFIG_TIMESTAMP=y CONFIG_BOOTM=y @@ -304,6 +313,7 @@ CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_REBOOT_MODE=y CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv" CONFIG_HAS_SCHED=y CONFIG_POLLER=y +CONFIG_POLLER_WARN_OVERTIME=y # CONFIG_BTHREAD is not set # CONFIG_TLV is not set CONFIG_STATE=y @@ -317,13 +327,6 @@ CONFIG_MACHINE_ID=y # CONFIG_SERIAL_NUMBER_FIXUP_SYSTEMD_HOSTNAME is not set # CONFIG_SYSTEMD_OF_WATCHDOG is not set CONFIG_EXTERNAL_DTS_FRAGMENTS="${PTXDIST_PLATFORMCONFIGDIR}/dts/bootstate.dtsi" - -# -# OP-TEE loading -# -# CONFIG_PBL_OPTEE is not set -# end of OP-TEE loading - CONFIG_FILETYPE_STRINGS=y # @@ -368,6 +371,7 @@ CONFIG_CC_HAS_KASAN_GENERIC=y # EFI (Extensible Firmware Interface) Support # CONFIG_HAVE_EFI_PAYLOAD=y +# CONFIG_EFI_PAYLOAD is not set CONFIG_HAVE_EFI_STUB=y # end of EFI (Extensible Firmware Interface) Support @@ -402,6 +406,7 @@ CONFIG_CMD_PM_DOMAIN=y CONFIG_CMD_NVMEM=y # CONFIG_CMD_VARINFO is not set CONFIG_CMD_VERSION=y +# CONFIG_CMD_BFETCH is not set # CONFIG_CMD_MMC is not set CONFIG_CMD_MMC_EXTCSD=y CONFIG_CMD_POLLER=y @@ -436,6 +441,7 @@ CONFIG_CMD_UMOUNT=y # # Environment # +# CONFIG_CMD_CREATENV is not set CONFIG_CMD_NV=y CONFIG_CMD_EXPORT=y # CONFIG_CMD_DEFAULTENV is not set @@ -513,7 +519,6 @@ CONFIG_CMD_CLEAR=y CONFIG_CMD_ECHO=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_EDIT=y -# CONFIG_CMD_LOGIN is not set CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y CONFIG_CMD_MENUTREE=y @@ -560,12 +565,18 @@ CONFIG_CMD_WD_DEFAULT_TIMOUT=0 # CONFIG_CMD_HAB is not set # end of Hardware manipulation +# +# Security +# +# CONFIG_CMD_BLOBGEN is not set +# CONFIG_CMD_LOGIN is not set +# end of Security + # # Miscellaneous # # CONFIG_CMD_2048 is not set CONFIG_CMD_BAREBOX_UPDATE=y -# CONFIG_CMD_BLOBGEN is not set CONFIG_CMD_FIRMWARELOAD=y # CONFIG_CMD_KALLSYMS is not set CONFIG_CMD_OF_COMPATIBLE=y @@ -666,6 +677,7 @@ CONFIG_DRIVER_NET_FEC_IMX=y # # MII PHY device drivers # +# CONFIG_ADIN_PHY is not set # CONFIG_AR8327N_PHY is not set # CONFIG_AT803X_PHY is not set # CONFIG_DAVICOM_PHY is not set @@ -771,6 +783,7 @@ CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y # CONFIG_MTD_UBI is not set CONFIG_DISK=y CONFIG_DISK_WRITE=y +# CONFIG_DM_BLK is not set # # drive types @@ -829,6 +842,8 @@ CONFIG_MCI=y # --- Feature list --- # # CONFIG_MCI_TUNING is not set +CONFIG_MCI_STARTUP_NONE=y +# CONFIG_MCI_STARTUP_NONREMOVABLE is not set # CONFIG_MCI_STARTUP is not set CONFIG_MCI_INFO=y CONFIG_MCI_WRITE=y @@ -851,6 +866,7 @@ CONFIG_MCI_IMX_ESDHC=y CONFIG_MCI_ARASAN=y CONFIG_MCI_AM654=y # CONFIG_MCI_SPI is not set +# CONFIG_MMC_CADENCE_SDHCI is not set CONFIG_MCI_IMX_ESDHC_PBL=y CONFIG_HAVE_CLK=y CONFIG_CLKDEV_LOOKUP=y @@ -986,6 +1002,11 @@ CONFIG_PINCTRL_SINGLE=y # end of Pin controllers CONFIG_NVMEM=y +CONFIG_NVMEM_LAYOUTS=y + +# +# Layout Types +# # CONFIG_NVMEM_RMEM is not set # CONFIG_NVMEM_SNVS_LPGPR is not set CONFIG_IMX_OCOTP=y @@ -993,6 +1014,7 @@ CONFIG_IMX_OCOTP=y # CONFIG_IMX_OCOTP_ELE is not set # CONFIG_EEPROM_93XX46 is not set CONFIG_NVMEM_ROCKCHIP_OTP=y +# CONFIG_NVMEM_ATMEL_SHA204A is not set # # Bus devices @@ -1016,6 +1038,7 @@ CONFIG_REGULATOR_RK808=y CONFIG_RESET_CONTROLLER=y CONFIG_RESET_IMX7=y +# CONFIG_RESET_SOCFPGA32 is not set CONFIG_HW_HAS_PCI=y # @@ -1198,61 +1221,23 @@ CONFIG_FS_FAT_LFN=y # end of Filesystem support # -# Library routines +# Security options # -CONFIG_PARAMETER=y -CONFIG_UNCOMPRESS=y -CONFIG_ZLIB=y -# CONFIG_BZLIB is not set -# CONFIG_LZ4_DECOMPRESS is not set -# CONFIG_ZSTD_DECOMPRESS is not set -CONFIG_XZ_DECOMPRESS=y -CONFIG_XZ_DEC_X86=y -CONFIG_XZ_DEC_POWERPC=y -CONFIG_XZ_DEC_IA64=y -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_ARMTHUMB=y -CONFIG_XZ_DEC_SPARC=y -CONFIG_XZ_DEC_ARM64=y -# CONFIG_BASE64 is not set -CONFIG_GENERIC_FIND_NEXT_BIT=y -CONFIG_PROCESS_ESCAPE_SEQUENCE=y -CONFIG_LZO_DECOMPRESS=y -CONFIG_FNMATCH=y -CONFIG_QSORT=y -CONFIG_IMAGE_SPARSE=y -CONFIG_FIP=y -CONFIG_LIBFDT=y -# CONFIG_RATP is not set -# CONFIG_ALLOW_PRNG_FALLBACK is not set -CONFIG_CRC_CCITT=y -# CONFIG_CRC8 is not set - -# -# Library gui routines -# -# end of Library gui routines - -CONFIG_PRINTF_UUID=y -CONFIG_NLS=y +CONFIG_INSECURE=y +# CONFIG_SECURITY_POLICY is not set +# CONFIG_PASSWORD is not set +# CONFIG_CRYPTO_KEYSTORE is not set # CONFIG_BLOBGEN is not set -# end of Library routines + +# +# OP-TEE loading +# +# CONFIG_PBL_OPTEE is not set +# end of OP-TEE loading # # Hardening options # - -# -# This barebox configuration has CONFIG_HAS_INSECURE_DEFAULTS=y indicating -# - -# -# that some of the configured options have potentially insecure defaults. -# - -# -# Extra care needs to be taken in secure booted systems. -# # CONFIG_BUG_ON_DATA_CORRUPTION is not set # @@ -1281,6 +1266,21 @@ CONFIG_PBL_STACKPROTECTOR_NONE=y # end of Buffer overflow protection # end of Hardening options +CONFIG_HAS_INSECURE_DEFAULTS=y + +# +# This barebox configuration has CONFIG_HAS_INSECURE_DEFAULTS=y indicating +# + +# +# that some of the configured options have potentially insecure defaults. +# + +# +# Extra care needs to be taken in secure booted systems. +# +# end of Security options + # # Crypto support # @@ -1305,9 +1305,49 @@ CONFIG_DIGEST_SHA256_ARM64_CE=y # CONFIG_CRYPTO_RSA is not set # CONFIG_CRYPTO_ECDSA is not set # CONFIG_CRYPTO_BUILTIN_KEYS is not set -# CONFIG_CRYPTO_KEYSTORE is not set # end of Crypto support +# +# Library routines +# +CONFIG_PARAMETER=y +CONFIG_UNCOMPRESS=y +CONFIG_ZLIB=y +# CONFIG_BZLIB is not set +# CONFIG_LZ4_DECOMPRESS is not set +# CONFIG_ZSTD_DECOMPRESS is not set +CONFIG_XZ_DECOMPRESS=y +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_XZ_DEC_ARM64=y +# CONFIG_BASE64 is not set +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_PROCESS_ESCAPE_SEQUENCE=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_FNMATCH=y +CONFIG_QSORT=y +CONFIG_IMAGE_SPARSE=y +CONFIG_FIP=y +CONFIG_LIBFDT=y +# CONFIG_RATP is not set +# CONFIG_ALLOW_PRNG_FALLBACK is not set +CONFIG_CRC_CCITT=y +# CONFIG_CRC8 is not set +# CONFIG_CRC16 is not set + +# +# Library gui routines +# +# end of Library gui routines + +CONFIG_PRINTF_UUID=y +CONFIG_NLS=y +# end of Library routines + # # Firmware files # diff --git a/configs/platform-v8a/patches/barebox-2025.07.0/0001-common-deep-probe-include-of-for-of_device_id.patch b/configs/platform-v8a/patches/barebox-2025.07.0/0001-common-deep-probe-include-of-for-of_device_id.patch deleted file mode 100644 index 4dcde1e..0000000 --- a/configs/platform-v8a/patches/barebox-2025.07.0/0001-common-deep-probe-include-of-for-of_device_id.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7b613535cda35020e6f65a96372fc0e9200f8d64 Mon Sep 17 00:00:00 2001 -From: Fabian Pflug <f.pflug@pengutronix.de> -Date: Tue, 21 Oct 2025 12:28:32 +0200 -Subject: [PATCH 1/2] common: deep-probe: include of for of_device_id - -The struct of_device_id is used by deep-probe in its own struct -deep_probe_entry, but never included. It does work, because all files -needing deep-probe currently also include of.h, but that should not be -mandatory. - -Signed-off-by: Fabian Pflug <f.pflug@pengutronix.de> ---- - include/deep-probe.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/deep-probe.h b/include/deep-probe.h -index 9ba9d09ec3..d1413f979e 100644 ---- a/include/deep-probe.h -+++ b/include/deep-probe.h -@@ -5,6 +5,7 @@ - #include <linux/stringify.h> - #include <linux/compiler_types.h> - #include <linux/types.h> -+#include <of.h> - - struct deep_probe_entry { - const struct of_device_id *device_id; --- -2.47.3 - diff --git a/configs/platform-v8a/patches/barebox-2025.07.0/0002-ARM-boards-i.MX93-Add-NXP-FRDM-i.MX93-support.patch b/configs/platform-v8a/patches/barebox-2025.07.0/0002-ARM-boards-i.MX93-Add-NXP-FRDM-i.MX93-support.patch deleted file mode 100644 index 1981fcf..0000000 --- a/configs/platform-v8a/patches/barebox-2025.07.0/0002-ARM-boards-i.MX93-Add-NXP-FRDM-i.MX93-support.patch +++ /dev/null @@ -1,2624 +0,0 @@ -From 597819f252f157760d77da1d7904a922e840f566 Mon Sep 17 00:00:00 2001 -From: Fabian Pflug <f.pflug@pengutronix.de> -Date: Wed, 21 May 2025 10:44:07 +0200 -Subject: [PATCH 2/2] ARM: boards: i.MX93: Add NXP FRDM i.MX93 support - -This board is a low cost i.MX93 eval board from NXP. - -There is no upstream DT yet, therefore a minimal DT is added in this -patch. The kernel DT is submitted in [0]. - -The DDR timings are copied from the NXP yocto layer [1] for u-boot with -some small modifications to remove unused timings and DDR sizes. - -[0] https://lore.kernel.org/r/20250526-fpg-nxp-imx93-frdm-v2-0-e5ad0efaec33@pengutronix.de -[1] https://github.com/nxp-imx-support/meta-imx-frdm/blob/lf-6.6.36-2.1.0/meta-imx-bsp/recipes-bsp/u-boot/u-boot-imx/0002-imx-imx93_frdm-Add-basic-board-support.patch - -Signed-off-by: Fabian Pflug <f.pflug@pengutronix.de> ---- - arch/arm/boards/Makefile | 1 + - arch/arm/boards/nxp-imx93-frdm/Makefile | 2 + - arch/arm/boards/nxp-imx93-frdm/board.c | 12 + - arch/arm/boards/nxp-imx93-frdm/lowlevel.c | 46 + - .../nxp-imx93-frdm/lpddr4x_2gb_timing.c | 1907 +++++++++++++++++ - arch/arm/dts/Makefile | 1 + - arch/arm/dts/imx93-frdm.dts | 534 +++++ - arch/arm/mach-imx/Kconfig | 9 + - images/Makefile.imx | 4 + - 9 files changed, 2516 insertions(+) - create mode 100644 arch/arm/boards/nxp-imx93-frdm/Makefile - create mode 100644 arch/arm/boards/nxp-imx93-frdm/board.c - create mode 100644 arch/arm/boards/nxp-imx93-frdm/lowlevel.c - create mode 100644 arch/arm/boards/nxp-imx93-frdm/lpddr4x_2gb_timing.c - create mode 100644 arch/arm/dts/imx93-frdm.dts - -diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile -index ac1fa74d4c..8bbf4d5ea5 100644 ---- a/arch/arm/boards/Makefile -+++ b/arch/arm/boards/Makefile -@@ -72,6 +72,7 @@ obj-$(CONFIG_MACH_NXP_IMX8MQ_EVK) += nxp-imx8mq-evk/ - obj-$(CONFIG_MACH_NXP_IMX8MM_EVK) += nxp-imx8mm-evk/ - obj-$(CONFIG_MACH_NXP_IMX8MN_EVK) += nxp-imx8mn-evk/ - obj-$(CONFIG_MACH_NXP_IMX8MP_EVK) += nxp-imx8mp-evk/ -+obj-$(CONFIG_MACH_NXP_IMX93_FRDM) += nxp-imx93-frdm/ - obj-$(CONFIG_MACH_CONGATEC_QMX8P_SOM) += congatec-qmx8p/ - obj-$(CONFIG_MACH_TQ_MBA8MPXL) += tqma8mpxl/ - obj-$(CONFIG_MACH_PCA100) += phytec-phycard-imx27/ -diff --git a/arch/arm/boards/nxp-imx93-frdm/Makefile b/arch/arm/boards/nxp-imx93-frdm/Makefile -new file mode 100644 -index 0000000000..ac419ef7c2 ---- /dev/null -+++ b/arch/arm/boards/nxp-imx93-frdm/Makefile -@@ -0,0 +1,2 @@ -+lwl-y += lowlevel.o lpddr4x_2gb_timing.o -+obj-y += board.o -diff --git a/arch/arm/boards/nxp-imx93-frdm/board.c b/arch/arm/boards/nxp-imx93-frdm/board.c -new file mode 100644 -index 0000000000..1e1c54ce81 ---- /dev/null -+++ b/arch/arm/boards/nxp-imx93-frdm/board.c -@@ -0,0 +1,12 @@ -+// SPDX-License-Identifier: GPL-2.0 -+ -+#include <deep-probe.h> -+ -+static const struct of_device_id frdm_imx93_of_match[] = { -+ { -+ .compatible = "fsl,imx93-11x11-frdm", -+ }, -+ { /* sentinel */ }, -+}; -+ -+BAREBOX_DEEP_PROBE_ENABLE(frdm_imx93_of_match); -diff --git a/arch/arm/boards/nxp-imx93-frdm/lowlevel.c b/arch/arm/boards/nxp-imx93-frdm/lowlevel.c -new file mode 100644 -index 0000000000..bc48160431 ---- /dev/null -+++ b/arch/arm/boards/nxp-imx93-frdm/lowlevel.c -@@ -0,0 +1,46 @@ -+// SPDX-License-Identifier: GPL-2.0 -+ -+#include <common.h> -+#include <debug_ll.h> -+#include <mach/imx/debug_ll.h> -+#include <mach/imx/generic.h> -+#include <mach/imx/xload.h> -+#include <asm/barebox-arm.h> -+#include <soc/imx9/ddr.h> -+#include <mach/imx/atf.h> -+#include <mach/imx/xload.h> -+#include <mach/imx/esdctl.h> -+ -+extern char __dtb_z_imx93_frdm_start[]; -+extern struct dram_timing_info frdm_imx93_dram_timing; -+ -+static noinline void frdm_imx93_continue(void) -+{ -+ void __iomem *base = IOMEM(MX9_UART1_BASE_ADDR); -+ void __iomem *muxbase = IOMEM(MX9_IOMUXC_BASE_ADDR); -+ -+ /* configure LPUART1 TX pin */ -+ writel(0x0, muxbase + 0x184); -+ -+ imx9_uart_setup(base); -+ pbl_set_putc(lpuart32_putc, base + 0x10); -+ putchar('>'); -+ -+ if (current_el() == 3) { -+ imx93_ddr_init(&frdm_imx93_dram_timing, DRAM_TYPE_LPDDR4); -+ imx93_load_and_start_image_via_tfa(); -+ } -+ -+ imx93_barebox_entry(__dtb_z_imx93_frdm_start); -+} -+ -+ENTRY_FUNCTION(start_imx93_nxp_mx93_frdm, r0, r1, r2) -+{ -+ if (current_el() == 3) -+ imx93_cpu_lowlevel_init(); -+ -+ relocate_to_current_adr(); -+ setup_c(); -+ -+ frdm_imx93_continue(); -+} -diff --git a/arch/arm/boards/nxp-imx93-frdm/lpddr4x_2gb_timing.c b/arch/arm/boards/nxp-imx93-frdm/lpddr4x_2gb_timing.c -new file mode 100644 -index 0000000000..84164094d8 ---- /dev/null -+++ b/arch/arm/boards/nxp-imx93-frdm/lpddr4x_2gb_timing.c -@@ -0,0 +1,1907 @@ -+/* -+ * Copyright 2024 NXP -+ * -+ * SPDX-License-Identifier: BSD-3-Clause -+ * -+ * Code generated with DDR Tool v3.4.0_8.3-4e2b550a. -+ * DDR PHY FW2022.01 -+ */ -+ -+#include <linux/kernel.h> -+#include <common.h> -+#include <soc/imx9/ddr.h> -+ -+/* Initialize DDRC registers */ -+static struct dram_cfg_param ddr_ddrc_cfg[] = { -+ {0x4e300110, 0x44100001}, -+ {0x4e300000, 0x8000ff}, -+ {0x4e300008, 0x0}, -+ {0x4e300080, 0x80000512}, -+ {0x4e300084, 0x0}, -+ {0x4e300114, 0x1002}, -+ {0x4e300260, 0x80}, -+ {0x4e300f04, 0x80}, -+ {0x4e300800, 0x43b30002}, -+ {0x4e300804, 0x1f1f1f1f}, -+ {0x4e301000, 0x0}, -+ {0x4e301240, 0x0}, -+ {0x4e301244, 0x0}, -+ {0x4e301248, 0x0}, -+ {0x4e30124c, 0x0}, -+ {0x4e301250, 0x0}, -+ {0x4e301254, 0x0}, -+ {0x4e301258, 0x0}, -+ {0x4e30125c, 0x0}, -+}; -+ -+/* dram fsp cfg */ -+static struct dram_fsp_cfg ddr_dram_fsp_cfg[] = { -+ { -+ { -+ {0x4e300100, 0x24AB321B}, -+ {0x4e300104, 0xF8EE001B}, -+ {0x4e300108, 0x2F2EE233}, -+ {0x4e30010C, 0x0005E18B}, -+ {0x4e300124, 0x1C760000}, -+ {0x4e300160, 0x00009102}, -+ {0x4e30016C, 0x35F00000}, -+ {0x4e300170, 0x8B0B0608}, -+ {0x4e300250, 0x00000028}, -+ {0x4e300254, 0x015B015B}, -+ {0x4e300258, 0x00000008}, -+ {0x4e30025C, 0x00000400}, -+ {0x4e300300, 0x224F2213}, -+ {0x4e300304, 0x015B2213}, -+ {0x4e300308, 0x0A3C0E3D}, -+ }, -+ { -+ {0x01, 0xE4}, -+ {0x02, 0x36}, -+ {0x03, 0x32}, -+ {0x0b, 0x46}, -+ {0x0c, 0x11}, -+ {0x0e, 0x11}, -+ {0x16, 0x04}, -+ }, -+ 0, -+ }, -+ { -+ { -+ {0x4e300100, 0x12552100}, -+ {0x4e300104, 0xF877000E}, -+ {0x4e300108, 0x1816B4AA}, -+ {0x4e30010C, 0x005101E6}, -+ {0x4e300124, 0x0E3C0000}, -+ {0x4e300160, 0x00009101}, -+ {0x4e30016C, 0x30900000}, -+ {0x4e300170, 0x8A0A0508}, -+ {0x4e300250, 0x00000014}, -+ {0x4e300254, 0x00AA00AA}, -+ {0x4e300258, 0x00000008}, -+ {0x4e30025C, 0x00000400}, -+ }, -+ { -+ {0x01, 0xB4}, -+ {0x02, 0x1B}, -+ {0x03, 0x32}, -+ {0x0b, 0x46}, -+ {0x0c, 0x11}, -+ {0x0e, 0x11}, -+ {0x16, 0x04}, -+ }, -+ 0, -+ }, -+ { -+ { -+ {0x4e300100, 0x00061000}, -+ {0x4e300104, 0xF855000A}, -+ {0x4e300108, 0x6E62FA48}, -+ {0x4e30010C, 0x0031010D}, -+ {0x4e300124, 0x04C50000}, -+ {0x4e300160, 0x00009100}, -+ {0x4e30016C, 0x30000000}, -+ {0x4e300170, 0x89090408}, -+ {0x4e300250, 0x00000007}, -+ {0x4e300254, 0x00340034}, -+ {0x4e300258, 0x00000008}, -+ {0x4e30025C, 0x00000400}, -+ }, -+ { -+ {0x01, 0x94}, -+ {0x02, 0x9}, -+ {0x03, 0x32}, -+ {0x0b, 0x46}, -+ {0x0c, 0x11}, -+ {0x0e, 0x11}, -+ {0x16, 0x04}, -+ }, -+ 1, -+ }, -+}; -+ -+/* PHY Initialize Configuration */ -+static struct dram_cfg_param ddr_ddrphy_cfg[] = { -+ {0x100a0, 0x4}, -+ {0x100a1, 0x5}, -+ {0x100a2, 0x6}, -+ {0x100a3, 0x7}, -+ {0x100a4, 0x0}, -+ {0x100a5, 0x1}, -+ {0x100a6, 0x2}, -+ {0x100a7, 0x3}, -+ {0x110a0, 0x3}, -+ {0x110a1, 0x2}, -+ {0x110a2, 0x0}, -+ {0x110a3, 0x1}, -+ {0x110a4, 0x7}, -+ {0x110a5, 0x6}, -+ {0x110a6, 0x4}, -+ {0x110a7, 0x5}, -+ {0x1005f, 0x5ff}, -+ {0x1015f, 0x5ff}, -+ {0x1105f, 0x5ff}, -+ {0x1115f, 0x5ff}, -+ {0x11005f, 0x5ff}, -+ {0x11015f, 0x5ff}, -+ {0x11105f, 0x5ff}, -+ {0x11115f, 0x5ff}, -+ {0x21005f, 0x5ff}, -+ {0x21015f, 0x5ff}, -+ {0x21105f, 0x5ff}, -+ {0x21115f, 0x5ff}, -+ {0x55, 0x1ff}, -+ {0x1055, 0x1ff}, -+ {0x2055, 0x1ff}, -+ {0x200c5, 0x19}, -+ {0x1200c5, 0xb}, -+ {0x2200c5, 0x7}, -+ {0x2002e, 0x2}, -+ {0x12002e, 0x2}, -+ {0x22002e, 0x2}, -+ {0x90204, 0x0}, -+ {0x190204, 0x0}, -+ {0x290204, 0x0}, -+ {0x20024, 0x1e3}, -+ {0x2003a, 0x2}, -+ {0x2007d, 0x212}, -+ {0x2007c, 0x61}, -+ {0x120024, 0x1e3}, -+ {0x2003a, 0x2}, -+ {0x12007d, 0x212}, -+ {0x12007c, 0x61}, -+ {0x220024, 0x1e3}, -+ {0x2003a, 0x2}, -+ {0x22007d, 0x212}, -+ {0x22007c, 0x61}, -+ {0x20056, 0x3}, -+ {0x120056, 0x3}, -+ {0x220056, 0x3}, -+ {0x1004d, 0x600}, -+ {0x1014d, 0x600}, -+ {0x1104d, 0x600}, -+ {0x1114d, 0x600}, -+ {0x11004d, 0x600}, -+ {0x11014d, 0x600}, -+ {0x11104d, 0x600}, -+ {0x11114d, 0x600}, -+ {0x21004d, 0x600}, -+ {0x21014d, 0x600}, -+ {0x21104d, 0x600}, -+ {0x21114d, 0x600}, -+ {0x10049, 0xe00}, -+ {0x10149, 0xe00}, -+ {0x11049, 0xe00}, -+ {0x11149, 0xe00}, -+ {0x110049, 0xe00}, -+ {0x110149, 0xe00}, -+ {0x111049, 0xe00}, -+ {0x111149, 0xe00}, -+ {0x210049, 0xe00}, -+ {0x210149, 0xe00}, -+ {0x211049, 0xe00}, -+ {0x211149, 0xe00}, -+ {0x43, 0x60}, -+ {0x1043, 0x60}, -+ {0x2043, 0x60}, -+ {0x20018, 0x1}, -+ {0x20075, 0x4}, -+ {0x20050, 0x0}, -+ {0x2009b, 0x2}, -+ {0x20008, 0x3a5}, -+ {0x120008, 0x1d3}, -+ {0x220008, 0x9c}, -+ {0x20088, 0x9}, -+ {0x200b2, 0x10c}, -+ {0x10043, 0x5a1}, -+ {0x10143, 0x5a1}, -+ {0x11043, 0x5a1}, -+ {0x11143, 0x5a1}, -+ {0x1200b2, 0x10c}, -+ {0x110043, 0x5a1}, -+ {0x110143, 0x5a1}, -+ {0x111043, 0x5a1}, -+ {0x111143, 0x5a1}, -+ {0x2200b2, 0x10c}, -+ {0x210043, 0x5a1}, -+ {0x210143, 0x5a1}, -+ {0x211043, 0x5a1}, -+ {0x211143, 0x5a1}, -+ {0x200fa, 0x2}, -+ {0x1200fa, 0x2}, -+ {0x2200fa, 0x2}, -+ {0x20019, 0x1}, -+ {0x120019, 0x1}, -+ {0x220019, 0x1}, -+ {0x200f0, 0x600}, -+ {0x200f1, 0x0}, -+ {0x200f2, 0x4444}, -+ {0x200f3, 0x8888}, -+ {0x200f4, 0x5655}, -+ {0x200f5, 0x0}, -+ {0x200f6, 0x0}, -+ {0x200f7, 0xf000}, -+ {0x1004a, 0x500}, -+ {0x1104a, 0x500}, -+ {0x20025, 0x0}, -+ {0x2002d, 0x0}, -+ {0x12002d, 0x0}, -+ {0x22002d, 0x0}, -+ {0x2002c, 0x0}, -+ {0x20021, 0x0}, -+ {0x200c7, 0x21}, -+ {0x1200c7, 0x21}, -+ {0x200ca, 0x24}, -+ {0x1200ca, 0x24}, -+}; -+ -+/* ddr phy trained csr */ -+static struct dram_cfg_param ddr_ddrphy_trained_csr[] = { -+ {0x1005f, 0x0}, -+ {0x1015f, 0x0}, -+ {0x1105f, 0x0}, -+ {0x1115f, 0x0}, -+ {0x11005f, 0x0}, -+ {0x11015f, 0x0}, -+ {0x11105f, 0x0}, -+ {0x11115f, 0x0}, -+ {0x21005f, 0x0}, -+ {0x21015f, 0x0}, -+ {0x21105f, 0x0}, -+ {0x21115f, 0x0}, -+ {0x55, 0x0}, -+ {0x1055, 0x0}, -+ {0x2055, 0x0}, -+ {0x200c5, 0x0}, -+ {0x1200c5, 0x0}, -+ {0x2200c5, 0x0}, -+ {0x2002e, 0x0}, -+ {0x12002e, 0x0}, -+ {0x22002e, 0x0}, -+ {0x90204, 0x0}, -+ {0x190204, 0x0}, -+ {0x290204, 0x0}, -+ {0x20024, 0x0}, -+ {0x2003a, 0x0}, -+ {0x2007d, 0x0}, -+ {0x2007c, 0x0}, -+ {0x120024, 0x0}, -+ {0x12007d, 0x0}, -+ {0x12007c, 0x0}, -+ {0x220024, 0x0}, -+ {0x22007d, 0x0}, -+ {0x22007c, 0x0}, -+ {0x20056, 0x0}, -+ {0x120056, 0x0}, -+ {0x220056, 0x0}, -+ {0x1004d, 0x0}, -+ {0x1014d, 0x0}, -+ {0x1104d, 0x0}, -+ {0x1114d, 0x0}, -+ {0x11004d, 0x0}, -+ {0x11014d, 0x0}, -+ {0x11104d, 0x0}, -+ {0x11114d, 0x0}, -+ {0x21004d, 0x0}, -+ {0x21014d, 0x0}, -+ {0x21104d, 0x0}, -+ {0x21114d, 0x0}, -+ {0x10049, 0x0}, -+ {0x10149, 0x0}, -+ {0x11049, 0x0}, -+ {0x11149, 0x0}, -+ {0x110049, 0x0}, -+ {0x110149, 0x0}, -+ {0x111049, 0x0}, -+ {0x111149, 0x0}, -+ {0x210049, 0x0}, -+ {0x210149, 0x0}, -+ {0x211049, 0x0}, -+ {0x211149, 0x0}, -+ {0x43, 0x0}, -+ {0x1043, 0x0}, -+ {0x2043, 0x0}, -+ {0x20018, 0x0}, -+ {0x20075, 0x0}, -+ {0x20050, 0x0}, -+ {0x2009b, 0x0}, -+ {0x20008, 0x0}, -+ {0x120008, 0x0}, -+ {0x220008, 0x0}, -+ {0x20088, 0x0}, -+ {0x200b2, 0x0}, -+ {0x10043, 0x0}, -+ {0x10143, 0x0}, -+ {0x11043, 0x0}, -+ {0x11143, 0x0}, -+ {0x1200b2, 0x0}, -+ {0x110043, 0x0}, -+ {0x110143, 0x0}, -+ {0x111043, 0x0}, -+ {0x111143, 0x0}, -+ {0x2200b2, 0x0}, -+ {0x210043, 0x0}, -+ {0x210143, 0x0}, -+ {0x211043, 0x0}, -+ {0x211143, 0x0}, -+ {0x200fa, 0x0}, -+ {0x1200fa, 0x0}, -+ {0x2200fa, 0x0}, -+ {0x20019, 0x0}, -+ {0x120019, 0x0}, -+ {0x220019, 0x0}, -+ {0x200f0, 0x0}, -+ {0x200f1, 0x0}, -+ {0x200f2, 0x0}, -+ {0x200f3, 0x0}, -+ {0x200f4, 0x0}, -+ {0x200f5, 0x0}, -+ {0x200f6, 0x0}, -+ {0x200f7, 0x0}, -+ {0x1004a, 0x0}, -+ {0x1104a, 0x0}, -+ {0x20025, 0x0}, -+ {0x2002d, 0x0}, -+ {0x12002d, 0x0}, -+ {0x22002d, 0x0}, -+ {0x2002c, 0x0}, -+ {0xd0000, 0x0}, -+ {0x90000, 0x0}, -+ {0x90001, 0x0}, -+ {0x90002, 0x0}, -+ {0x90003, 0x0}, -+ {0x90004, 0x0}, -+ {0x90005, 0x0}, -+ {0x90029, 0x0}, -+ {0x9002a, 0x0}, -+ {0x9002b, 0x0}, -+ {0x9002c, 0x0}, -+ {0x9002d, 0x0}, -+ {0x9002e, 0x0}, -+ {0x9002f, 0x0}, -+ {0x90030, 0x0}, -+ {0x90031, 0x0}, -+ {0x90032, 0x0}, -+ {0x90033, 0x0}, -+ {0x90034, 0x0}, -+ {0x90035, 0x0}, -+ {0x90036, 0x0}, -+ {0x90037, 0x0}, -+ {0x90038, 0x0}, -+ {0x90039, 0x0}, -+ {0x9003a, 0x0}, -+ {0x9003b, 0x0}, -+ {0x9003c, 0x0}, -+ {0x9003d, 0x0}, -+ {0x9003e, 0x0}, -+ {0x9003f, 0x0}, -+ {0x90040, 0x0}, -+ {0x90041, 0x0}, -+ {0x90042, 0x0}, -+ {0x90043, 0x0}, -+ {0x90044, 0x0}, -+ {0x90045, 0x0}, -+ {0x90046, 0x0}, -+ {0x90047, 0x0}, -+ {0x90048, 0x0}, -+ {0x90049, 0x0}, -+ {0x9004a, 0x0}, -+ {0x9004b, 0x0}, -+ {0x9004c, 0x0}, -+ {0x9004d, 0x0}, -+ {0x9004e, 0x0}, -+ {0x9004f, 0x0}, -+ {0x90050, 0x0}, -+ {0x90051, 0x0}, -+ {0x90052, 0x0}, -+ {0x90053, 0x0}, -+ {0x90054, 0x0}, -+ {0x90055, 0x0}, -+ {0x90056, 0x0}, -+ {0x90057, 0x0}, -+ {0x90058, 0x0}, -+ {0x90059, 0x0}, -+ {0x9005a, 0x0}, -+ {0x9005b, 0x0}, -+ {0x9005c, 0x0}, -+ {0x9005d, 0x0}, -+ {0x9005e, 0x0}, -+ {0x9005f, 0x0}, -+ {0x90060, 0x0}, -+ {0x90061, 0x0}, -+ {0x90062, 0x0}, -+ {0x90063, 0x0}, -+ {0x90064, 0x0}, -+ {0x90065, 0x0}, -+ {0x90066, 0x0}, -+ {0x90067, 0x0}, -+ {0x90068, 0x0}, -+ {0x90069, 0x0}, -+ {0x9006a, 0x0}, -+ {0x9006b, 0x0}, -+ {0x9006c, 0x0}, -+ {0x9006d, 0x0}, -+ {0x9006e, 0x0}, -+ {0x9006f, 0x0}, -+ {0x90070, 0x0}, -+ {0x90071, 0x0}, -+ {0x90072, 0x0}, -+ {0x90073, 0x0}, -+ {0x90074, 0x0}, -+ {0x90075, 0x0}, -+ {0x90076, 0x0}, -+ {0x90077, 0x0}, -+ {0x90078, 0x0}, -+ {0x90079, 0x0}, -+ {0x9007a, 0x0}, -+ {0x9007b, 0x0}, -+ {0x9007c, 0x0}, -+ {0x9007d, 0x0}, -+ {0x9007e, 0x0}, -+ {0x9007f, 0x0}, -+ {0x90080, 0x0}, -+ {0x90081, 0x0}, -+ {0x90082, 0x0}, -+ {0x90083, 0x0}, -+ {0x90084, 0x0}, -+ {0x90085, 0x0}, -+ {0x90086, 0x0}, -+ {0x90087, 0x0}, -+ {0x90088, 0x0}, -+ {0x90089, 0x0}, -+ {0x9008a, 0x0}, -+ {0x9008b, 0x0}, -+ {0x9008c, 0x0}, -+ {0x9008d, 0x0}, -+ {0x9008e, 0x0}, -+ {0x9008f, 0x0}, -+ {0x90090, 0x0}, -+ {0x90091, 0x0}, -+ {0x90092, 0x0}, -+ {0x90093, 0x0}, -+ {0x90094, 0x0}, -+ {0x90095, 0x0}, -+ {0x90096, 0x0}, -+ {0x90097, 0x0}, -+ {0x90098, 0x0}, -+ {0x90099, 0x0}, -+ {0x9009a, 0x0}, -+ {0x9009b, 0x0}, -+ {0x9009c, 0x0}, -+ {0x9009d, 0x0}, -+ {0x9009e, 0x0}, -+ {0x9009f, 0x0}, -+ {0x900a0, 0x0}, -+ {0x900a1, 0x0}, -+ {0x900a2, 0x0}, -+ {0x900a3, 0x0}, -+ {0x900a4, 0x0}, -+ {0x900a5, 0x0}, -+ {0x900a6, 0x0}, -+ {0x900a7, 0x0}, -+ {0x900a8, 0x0}, -+ {0x900a9, 0x0}, -+ {0x40000, 0x0}, -+ {0x40020, 0x0}, -+ {0x40040, 0x0}, -+ {0x40060, 0x0}, -+ {0x40001, 0x0}, -+ {0x40021, 0x0}, -+ {0x40041, 0x0}, -+ {0x40061, 0x0}, -+ {0x40002, 0x0}, -+ {0x40022, 0x0}, -+ {0x40042, 0x0}, -+ {0x40062, 0x0}, -+ {0x40003, 0x0}, -+ {0x40023, 0x0}, -+ {0x40043, 0x0}, -+ {0x40063, 0x0}, -+ {0x40004, 0x0}, -+ {0x40024, 0x0}, -+ {0x40044, 0x0}, -+ {0x40064, 0x0}, -+ {0x40005, 0x0}, -+ {0x40025, 0x0}, -+ {0x40045, 0x0}, -+ {0x40065, 0x0}, -+ {0x40006, 0x0}, -+ {0x40026, 0x0}, -+ {0x40046, 0x0}, -+ {0x40066, 0x0}, -+ {0x40007, 0x0}, -+ {0x40027, 0x0}, -+ {0x40047, 0x0}, -+ {0x40067, 0x0}, -+ {0x40008, 0x0}, -+ {0x40028, 0x0}, -+ {0x40048, 0x0}, -+ {0x40068, 0x0}, -+ {0x40009, 0x0}, -+ {0x40029, 0x0}, -+ {0x40049, 0x0}, -+ {0x40069, 0x0}, -+ {0x4000a, 0x0}, -+ {0x4002a, 0x0}, -+ {0x4004a, 0x0}, -+ {0x4006a, 0x0}, -+ {0x4000b, 0x0}, -+ {0x4002b, 0x0}, -+ {0x4004b, 0x0}, -+ {0x4006b, 0x0}, -+ {0x4000c, 0x0}, -+ {0x4002c, 0x0}, -+ {0x4004c, 0x0}, -+ {0x4006c, 0x0}, -+ {0x4000d, 0x0}, -+ {0x4002d, 0x0}, -+ {0x4004d, 0x0}, -+ {0x4006d, 0x0}, -+ {0x4000e, 0x0}, -+ {0x4002e, 0x0}, -+ {0x4004e, 0x0}, -+ {0x4006e, 0x0}, -+ {0x4000f, 0x0}, -+ {0x4002f, 0x0}, -+ {0x4004f, 0x0}, -+ {0x4006f, 0x0}, -+ {0x40010, 0x0}, -+ {0x40030, 0x0}, -+ {0x40050, 0x0}, -+ {0x40070, 0x0}, -+ {0x40011, 0x0}, -+ {0x40031, 0x0}, -+ {0x40051, 0x0}, -+ {0x40071, 0x0}, -+ {0x40012, 0x0}, -+ {0x40032, 0x0}, -+ {0x40052, 0x0}, -+ {0x40072, 0x0}, -+ {0x40013, 0x0}, -+ {0x40033, 0x0}, -+ {0x40053, 0x0}, -+ {0x40073, 0x0}, -+ {0x40014, 0x0}, -+ {0x40034, 0x0}, -+ {0x40054, 0x0}, -+ {0x40074, 0x0}, -+ {0x40015, 0x0}, -+ {0x40035, 0x0}, -+ {0x40055, 0x0}, -+ {0x40075, 0x0}, -+ {0x40016, 0x0}, -+ {0x40036, 0x0}, -+ {0x40056, 0x0}, -+ {0x40076, 0x0}, -+ {0x40017, 0x0}, -+ {0x40037, 0x0}, -+ {0x40057, 0x0}, -+ {0x40077, 0x0}, -+ {0x40018, 0x0}, -+ {0x40038, 0x0}, -+ {0x40058, 0x0}, -+ {0x40078, 0x0}, -+ {0x40019, 0x0}, -+ {0x40039, 0x0}, -+ {0x40059, 0x0}, -+ {0x40079, 0x0}, -+ {0x4001a, 0x0}, -+ {0x4003a, 0x0}, -+ {0x4005a, 0x0}, -+ {0x4007a, 0x0}, -+ {0x900aa, 0x0}, -+ {0x900ab, 0x0}, -+ {0x900ac, 0x0}, -+ {0x900ad, 0x0}, -+ {0x900ae, 0x0}, -+ {0x900af, 0x0}, -+ {0x900b0, 0x0}, -+ {0x900b1, 0x0}, -+ {0x900b2, 0x0}, -+ {0x900b3, 0x0}, -+ {0x900b4, 0x0}, -+ {0x900b5, 0x0}, -+ {0x900b6, 0x0}, -+ {0x900b7, 0x0}, -+ {0x900b8, 0x0}, -+ {0x900b9, 0x0}, -+ {0x900ba, 0x0}, -+ {0x900bb, 0x0}, -+ {0x900bc, 0x0}, -+ {0x900bd, 0x0}, -+ {0x900be, 0x0}, -+ {0x900bf, 0x0}, -+ {0x900c0, 0x0}, -+ {0x900c1, 0x0}, -+ {0x900c2, 0x0}, -+ {0x900c3, 0x0}, -+ {0x900c4, 0x0}, -+ {0x900c5, 0x0}, -+ {0x900c6, 0x0}, -+ {0x900c7, 0x0}, -+ {0x900c8, 0x0}, -+ {0x900c9, 0x0}, -+ {0x900ca, 0x0}, -+ {0x900cb, 0x0}, -+ {0x900cc, 0x0}, -+ {0x900cd, 0x0}, -+ {0x900ce, 0x0}, -+ {0x900cf, 0x0}, -+ {0x900d0, 0x0}, -+ {0x900d1, 0x0}, -+ {0x900d2, 0x0}, -+ {0x900d3, 0x0}, -+ {0x900d4, 0x0}, -+ {0x900d5, 0x0}, -+ {0x900d6, 0x0}, -+ {0x900d7, 0x0}, -+ {0x900d8, 0x0}, -+ {0x900d9, 0x0}, -+ {0x900da, 0x0}, -+ {0x900db, 0x0}, -+ {0x900dc, 0x0}, -+ {0x900dd, 0x0}, -+ {0x900de, 0x0}, -+ {0x900df, 0x0}, -+ {0x900e0, 0x0}, -+ {0x900e1, 0x0}, -+ {0x900e2, 0x0}, -+ {0x900e3, 0x0}, -+ {0x900e4, 0x0}, -+ {0x900e5, 0x0}, -+ {0x900e6, 0x0}, -+ {0x900e7, 0x0}, -+ {0x900e8, 0x0}, -+ {0x900e9, 0x0}, -+ {0x900ea, 0x0}, -+ {0x900eb, 0x0}, -+ {0x900ec, 0x0}, -+ {0x900ed, 0x0}, -+ {0x900ee, 0x0}, -+ {0x900ef, 0x0}, -+ {0x900f0, 0x0}, -+ {0x900f1, 0x0}, -+ {0x900f2, 0x0}, -+ {0x900f3, 0x0}, -+ {0x900f4, 0x0}, -+ {0x900f5, 0x0}, -+ {0x900f6, 0x0}, -+ {0x900f7, 0x0}, -+ {0x900f8, 0x0}, -+ {0x900f9, 0x0}, -+ {0x900fa, 0x0}, -+ {0x900fb, 0x0}, -+ {0x900fc, 0x0}, -+ {0x900fd, 0x0}, -+ {0x900fe, 0x0}, -+ {0x900ff, 0x0}, -+ {0x90100, 0x0}, -+ {0x90101, 0x0}, -+ {0x90102, 0x0}, -+ {0x90103, 0x0}, -+ {0x90104, 0x0}, -+ {0x90105, 0x0}, -+ {0x90106, 0x0}, -+ {0x90107, 0x0}, -+ {0x90108, 0x0}, -+ {0x90109, 0x0}, -+ {0x9010a, 0x0}, -+ {0x9010b, 0x0}, -+ {0x9010c, 0x0}, -+ {0x9010d, 0x0}, -+ {0x9010e, 0x0}, -+ {0x9010f, 0x0}, -+ {0x90110, 0x0}, -+ {0x90111, 0x0}, -+ {0x90112, 0x0}, -+ {0x90113, 0x0}, -+ {0x90114, 0x0}, -+ {0x90115, 0x0}, -+ {0x90116, 0x0}, -+ {0x90117, 0x0}, -+ {0x90118, 0x0}, -+ {0x90119, 0x0}, -+ {0x9011a, 0x0}, -+ {0x9011b, 0x0}, -+ {0x9011c, 0x0}, -+ {0x9011d, 0x0}, -+ {0x9011e, 0x0}, -+ {0x9011f, 0x0}, -+ {0x90120, 0x0}, -+ {0x90121, 0x0}, -+ {0x90122, 0x0}, -+ {0x90123, 0x0}, -+ {0x90124, 0x0}, -+ {0x90125, 0x0}, -+ {0x90126, 0x0}, -+ {0x90127, 0x0}, -+ {0x90128, 0x0}, -+ {0x90129, 0x0}, -+ {0x9012a, 0x0}, -+ {0x9012b, 0x0}, -+ {0x9012c, 0x0}, -+ {0x9012d, 0x0}, -+ {0x9012e, 0x0}, -+ {0x9012f, 0x0}, -+ {0x90130, 0x0}, -+ {0x90131, 0x0}, -+ {0x90132, 0x0}, -+ {0x90133, 0x0}, -+ {0x90134, 0x0}, -+ {0x90135, 0x0}, -+ {0x90136, 0x0}, -+ {0x90137, 0x0}, -+ {0x90138, 0x0}, -+ {0x90139, 0x0}, -+ {0x9013a, 0x0}, -+ {0x9013b, 0x0}, -+ {0x9013c, 0x0}, -+ {0x9013d, 0x0}, -+ {0x9013e, 0x0}, -+ {0x9013f, 0x0}, -+ {0x90140, 0x0}, -+ {0x90141, 0x0}, -+ {0x90142, 0x0}, -+ {0x90143, 0x0}, -+ {0x90144, 0x0}, -+ {0x90145, 0x0}, -+ {0x90146, 0x0}, -+ {0x90147, 0x0}, -+ {0x90148, 0x0}, -+ {0x90149, 0x0}, -+ {0x9014a, 0x0}, -+ {0x9014b, 0x0}, -+ {0x9014c, 0x0}, -+ {0x9014d, 0x0}, -+ {0x9014e, 0x0}, -+ {0x9014f, 0x0}, -+ {0x90150, 0x0}, -+ {0x90151, 0x0}, -+ {0x90152, 0x0}, -+ {0x90153, 0x0}, -+ {0x90154, 0x0}, -+ {0x90155, 0x0}, -+ {0x90156, 0x0}, -+ {0x90157, 0x0}, -+ {0x90158, 0x0}, -+ {0x90159, 0x0}, -+ {0x9015a, 0x0}, -+ {0x9015b, 0x0}, -+ {0x9015c, 0x0}, -+ {0x9015d, 0x0}, -+ {0x9015e, 0x0}, -+ {0x9015f, 0x0}, -+ {0x90160, 0x0}, -+ {0x90161, 0x0}, -+ {0x90162, 0x0}, -+ {0x90163, 0x0}, -+ {0x90164, 0x0}, -+ {0x90165, 0x0}, -+ {0x90166, 0x0}, -+ {0x90167, 0x0}, -+ {0x90168, 0x0}, -+ {0x90169, 0x0}, -+ {0x9016a, 0x0}, -+ {0x9016b, 0x0}, -+ {0x9016c, 0x0}, -+ {0x9016d, 0x0}, -+ {0x9016e, 0x0}, -+ {0x9016f, 0x0}, -+ {0x90170, 0x0}, -+ {0x90171, 0x0}, -+ {0x90172, 0x0}, -+ {0x90173, 0x0}, -+ {0x90174, 0x0}, -+ {0x90175, 0x0}, -+ {0x90176, 0x0}, -+ {0x90177, 0x0}, -+ {0x90178, 0x0}, -+ {0x90179, 0x0}, -+ {0x9017a, 0x0}, -+ {0x9017b, 0x0}, -+ {0x9017c, 0x0}, -+ {0x9017d, 0x0}, -+ {0x9017e, 0x0}, -+ {0x9017f, 0x0}, -+ {0x90180, 0x0}, -+ {0x90181, 0x0}, -+ {0x90182, 0x0}, -+ {0x90183, 0x0}, -+ {0x90184, 0x0}, -+ {0x90006, 0x0}, -+ {0x90007, 0x0}, -+ {0x90008, 0x0}, -+ {0x90009, 0x0}, -+ {0x9000a, 0x0}, -+ {0x9000b, 0x0}, -+ {0xd00e7, 0x0}, -+ {0x90017, 0x0}, -+ {0x9001f, 0x0}, -+ {0x90026, 0x0}, -+ {0x400d0, 0x0}, -+ {0x400d1, 0x0}, -+ {0x400d2, 0x0}, -+ {0x400d3, 0x0}, -+ {0x400d4, 0x0}, -+ {0x400d5, 0x0}, -+ {0x400d6, 0x0}, -+ {0x400d7, 0x0}, -+ {0x200be, 0x0}, -+ {0x2000b, 0x0}, -+ {0x2000c, 0x0}, -+ {0x2000d, 0x0}, -+ {0x2000e, 0x0}, -+ {0x12000b, 0x0}, -+ {0x12000c, 0x0}, -+ {0x12000d, 0x0}, -+ {0x12000e, 0x0}, -+ {0x22000b, 0x0}, -+ {0x22000c, 0x0}, -+ {0x22000d, 0x0}, -+ {0x22000e, 0x0}, -+ {0x9000c, 0x0}, -+ {0x9000d, 0x0}, -+ {0x9000e, 0x0}, -+ {0x9000f, 0x0}, -+ {0x90010, 0x0}, -+ {0x90011, 0x0}, -+ {0x90012, 0x0}, -+ {0x90013, 0x0}, -+ {0x20010, 0x0}, -+ {0x20011, 0x0}, -+ {0x120010, 0x0}, -+ {0x120011, 0x0}, -+ {0x40080, 0x0}, -+ {0x40081, 0x0}, -+ {0x40082, 0x0}, -+ {0x40083, 0x0}, -+ {0x40084, 0x0}, -+ {0x40085, 0x0}, -+ {0x140080, 0x0}, -+ {0x140081, 0x0}, -+ {0x140082, 0x0}, -+ {0x140083, 0x0}, -+ {0x140084, 0x0}, -+ {0x140085, 0x0}, -+ {0x240080, 0x0}, -+ {0x240081, 0x0}, -+ {0x240082, 0x0}, -+ {0x240083, 0x0}, -+ {0x240084, 0x0}, -+ {0x240085, 0x0}, -+ {0x400fd, 0x0}, -+ {0x400f1, 0x0}, -+ {0x10011, 0x0}, -+ {0x10012, 0x0}, -+ {0x10013, 0x0}, -+ {0x10018, 0x0}, -+ {0x10002, 0x0}, -+ {0x100b2, 0x0}, -+ {0x101b4, 0x0}, -+ {0x102b4, 0x0}, -+ {0x103b4, 0x0}, -+ {0x104b4, 0x0}, -+ {0x105b4, 0x0}, -+ {0x106b4, 0x0}, -+ {0x107b4, 0x0}, -+ {0x108b4, 0x0}, -+ {0x11011, 0x0}, -+ {0x11012, 0x0}, -+ {0x11013, 0x0}, -+ {0x11018, 0x0}, -+ {0x11002, 0x0}, -+ {0x110b2, 0x0}, -+ {0x111b4, 0x0}, -+ {0x112b4, 0x0}, -+ {0x113b4, 0x0}, -+ {0x114b4, 0x0}, -+ {0x115b4, 0x0}, -+ {0x116b4, 0x0}, -+ {0x117b4, 0x0}, -+ {0x118b4, 0x0}, -+ {0x20089, 0x0}, -+ {0xc0080, 0x0}, -+ {0x200cb, 0x0}, -+ {0x10068, 0x0}, -+ {0x10069, 0x0}, -+ {0x10168, 0x0}, -+ {0x10169, 0x0}, -+ {0x10268, 0x0}, -+ {0x10269, 0x0}, -+ {0x10368, 0x0}, -+ {0x10369, 0x0}, -+ {0x10468, 0x0}, -+ {0x10469, 0x0}, -+ {0x10568, 0x0}, -+ {0x10569, 0x0}, -+ {0x10668, 0x0}, -+ {0x10669, 0x0}, -+ {0x10768, 0x0}, -+ {0x10769, 0x0}, -+ {0x10868, 0x0}, -+ {0x10869, 0x0}, -+ {0x100aa, 0x0}, -+ {0x10062, 0x0}, -+ {0x10001, 0x0}, -+ {0x100a0, 0x0}, -+ {0x100a1, 0x0}, -+ {0x100a2, 0x0}, -+ {0x100a3, 0x0}, -+ {0x100a4, 0x0}, -+ {0x100a5, 0x0}, -+ {0x100a6, 0x0}, -+ {0x100a7, 0x0}, -+ {0x11068, 0x0}, -+ {0x11069, 0x0}, -+ {0x11168, 0x0}, -+ {0x11169, 0x0}, -+ {0x11268, 0x0}, -+ {0x11269, 0x0}, -+ {0x11368, 0x0}, -+ {0x11369, 0x0}, -+ {0x11468, 0x0}, -+ {0x11469, 0x0}, -+ {0x11568, 0x0}, -+ {0x11569, 0x0}, -+ {0x11668, 0x0}, -+ {0x11669, 0x0}, -+ {0x11768, 0x0}, -+ {0x11769, 0x0}, -+ {0x11868, 0x0}, -+ {0x11869, 0x0}, -+ {0x110aa, 0x0}, -+ {0x11062, 0x0}, -+ {0x11001, 0x0}, -+ {0x110a0, 0x0}, -+ {0x110a1, 0x0}, -+ {0x110a2, 0x0}, -+ {0x110a3, 0x0}, -+ {0x110a4, 0x0}, -+ {0x110a5, 0x0}, -+ {0x110a6, 0x0}, -+ {0x110a7, 0x0}, -+ {0x80, 0x0}, -+ {0x1080, 0x0}, -+ {0x2080, 0x0}, -+ {0x10020, 0x0}, -+ {0x10080, 0x0}, -+ {0x10081, 0x0}, -+ {0x100d0, 0x0}, -+ {0x100d1, 0x0}, -+ {0x1008c, 0x0}, -+ {0x1008d, 0x0}, -+ {0x10180, 0x0}, -+ {0x10181, 0x0}, -+ {0x101d0, 0x0}, -+ {0x101d1, 0x0}, -+ {0x1018c, 0x0}, -+ {0x1018d, 0x0}, -+ {0x100c0, 0x0}, -+ {0x100c1, 0x0}, -+ {0x101c0, 0x0}, -+ {0x101c1, 0x0}, -+ {0x102c0, 0x0}, -+ {0x102c1, 0x0}, -+ {0x103c0, 0x0}, -+ {0x103c1, 0x0}, -+ {0x104c0, 0x0}, -+ {0x104c1, 0x0}, -+ {0x105c0, 0x0}, -+ {0x105c1, 0x0}, -+ {0x106c0, 0x0}, -+ {0x106c1, 0x0}, -+ {0x107c0, 0x0}, -+ {0x107c1, 0x0}, -+ {0x108c0, 0x0}, -+ {0x108c1, 0x0}, -+ {0x100ae, 0x0}, -+ {0x100af, 0x0}, -+ {0x11020, 0x0}, -+ {0x11080, 0x0}, -+ {0x11081, 0x0}, -+ {0x110d0, 0x0}, -+ {0x110d1, 0x0}, -+ {0x1108c, 0x0}, -+ {0x1108d, 0x0}, -+ {0x11180, 0x0}, -+ {0x11181, 0x0}, -+ {0x111d0, 0x0}, -+ {0x111d1, 0x0}, -+ {0x1118c, 0x0}, -+ {0x1118d, 0x0}, -+ {0x110c0, 0x0}, -+ {0x110c1, 0x0}, -+ {0x111c0, 0x0}, -+ {0x111c1, 0x0}, -+ {0x112c0, 0x0}, -+ {0x112c1, 0x0}, -+ {0x113c0, 0x0}, -+ {0x113c1, 0x0}, -+ {0x114c0, 0x0}, -+ {0x114c1, 0x0}, -+ {0x115c0, 0x0}, -+ {0x115c1, 0x0}, -+ {0x116c0, 0x0}, -+ {0x116c1, 0x0}, -+ {0x117c0, 0x0}, -+ {0x117c1, 0x0}, -+ {0x118c0, 0x0}, -+ {0x118c1, 0x0}, -+ {0x110ae, 0x0}, -+ {0x110af, 0x0}, -+ {0x90201, 0x0}, -+ {0x90202, 0x0}, -+ {0x90203, 0x0}, -+ {0x90205, 0x0}, -+ {0x90206, 0x0}, -+ {0x90207, 0x0}, -+ {0x90208, 0x0}, -+ {0x20020, 0x0}, -+ {0x100080, 0x0}, -+ {0x101080, 0x0}, -+ {0x102080, 0x0}, -+ {0x110020, 0x0}, -+ {0x110080, 0x0}, -+ {0x110081, 0x0}, -+ {0x1100d0, 0x0}, -+ {0x1100d1, 0x0}, -+ {0x11008c, 0x0}, -+ {0x11008d, 0x0}, -+ {0x110180, 0x0}, -+ {0x110181, 0x0}, -+ {0x1101d0, 0x0}, -+ {0x1101d1, 0x0}, -+ {0x11018c, 0x0}, -+ {0x11018d, 0x0}, -+ {0x1100c0, 0x0}, -+ {0x1100c1, 0x0}, -+ {0x1101c0, 0x0}, -+ {0x1101c1, 0x0}, -+ {0x1102c0, 0x0}, -+ {0x1102c1, 0x0}, -+ {0x1103c0, 0x0}, -+ {0x1103c1, 0x0}, -+ {0x1104c0, 0x0}, -+ {0x1104c1, 0x0}, -+ {0x1105c0, 0x0}, -+ {0x1105c1, 0x0}, -+ {0x1106c0, 0x0}, -+ {0x1106c1, 0x0}, -+ {0x1107c0, 0x0}, -+ {0x1107c1, 0x0}, -+ {0x1108c0, 0x0}, -+ {0x1108c1, 0x0}, -+ {0x1100ae, 0x0}, -+ {0x1100af, 0x0}, -+ {0x111020, 0x0}, -+ {0x111080, 0x0}, -+ {0x111081, 0x0}, -+ {0x1110d0, 0x0}, -+ {0x1110d1, 0x0}, -+ {0x11108c, 0x0}, -+ {0x11108d, 0x0}, -+ {0x111180, 0x0}, -+ {0x111181, 0x0}, -+ {0x1111d0, 0x0}, -+ {0x1111d1, 0x0}, -+ {0x11118c, 0x0}, -+ {0x11118d, 0x0}, -+ {0x1110c0, 0x0}, -+ {0x1110c1, 0x0}, -+ {0x1111c0, 0x0}, -+ {0x1111c1, 0x0}, -+ {0x1112c0, 0x0}, -+ {0x1112c1, 0x0}, -+ {0x1113c0, 0x0}, -+ {0x1113c1, 0x0}, -+ {0x1114c0, 0x0}, -+ {0x1114c1, 0x0}, -+ {0x1115c0, 0x0}, -+ {0x1115c1, 0x0}, -+ {0x1116c0, 0x0}, -+ {0x1116c1, 0x0}, -+ {0x1117c0, 0x0}, -+ {0x1117c1, 0x0}, -+ {0x1118c0, 0x0}, -+ {0x1118c1, 0x0}, -+ {0x1110ae, 0x0}, -+ {0x1110af, 0x0}, -+ {0x190201, 0x0}, -+ {0x190202, 0x0}, -+ {0x190203, 0x0}, -+ {0x190205, 0x0}, -+ {0x190206, 0x0}, -+ {0x190207, 0x0}, -+ {0x190208, 0x0}, -+ {0x120020, 0x0}, -+ {0x200080, 0x0}, -+ {0x201080, 0x0}, -+ {0x202080, 0x0}, -+ {0x210020, 0x0}, -+ {0x210080, 0x0}, -+ {0x210081, 0x0}, -+ {0x2100d0, 0x0}, -+ {0x2100d1, 0x0}, -+ {0x21008c, 0x0}, -+ {0x21008d, 0x0}, -+ {0x210180, 0x0}, -+ {0x210181, 0x0}, -+ {0x2101d0, 0x0}, -+ {0x2101d1, 0x0}, -+ {0x21018c, 0x0}, -+ {0x21018d, 0x0}, -+ {0x2100c0, 0x0}, -+ {0x2100c1, 0x0}, -+ {0x2101c0, 0x0}, -+ {0x2101c1, 0x0}, -+ {0x2102c0, 0x0}, -+ {0x2102c1, 0x0}, -+ {0x2103c0, 0x0}, -+ {0x2103c1, 0x0}, -+ {0x2104c0, 0x0}, -+ {0x2104c1, 0x0}, -+ {0x2105c0, 0x0}, -+ {0x2105c1, 0x0}, -+ {0x2106c0, 0x0}, -+ {0x2106c1, 0x0}, -+ {0x2107c0, 0x0}, -+ {0x2107c1, 0x0}, -+ {0x2108c0, 0x0}, -+ {0x2108c1, 0x0}, -+ {0x2100ae, 0x0}, -+ {0x2100af, 0x0}, -+ {0x211020, 0x0}, -+ {0x211080, 0x0}, -+ {0x211081, 0x0}, -+ {0x2110d0, 0x0}, -+ {0x2110d1, 0x0}, -+ {0x21108c, 0x0}, -+ {0x21108d, 0x0}, -+ {0x211180, 0x0}, -+ {0x211181, 0x0}, -+ {0x2111d0, 0x0}, -+ {0x2111d1, 0x0}, -+ {0x21118c, 0x0}, -+ {0x21118d, 0x0}, -+ {0x2110c0, 0x0}, -+ {0x2110c1, 0x0}, -+ {0x2111c0, 0x0}, -+ {0x2111c1, 0x0}, -+ {0x2112c0, 0x0}, -+ {0x2112c1, 0x0}, -+ {0x2113c0, 0x0}, -+ {0x2113c1, 0x0}, -+ {0x2114c0, 0x0}, -+ {0x2114c1, 0x0}, -+ {0x2115c0, 0x0}, -+ {0x2115c1, 0x0}, -+ {0x2116c0, 0x0}, -+ {0x2116c1, 0x0}, -+ {0x2117c0, 0x0}, -+ {0x2117c1, 0x0}, -+ {0x2118c0, 0x0}, -+ {0x2118c1, 0x0}, -+ {0x2110ae, 0x0}, -+ {0x2110af, 0x0}, -+ {0x290201, 0x0}, -+ {0x290202, 0x0}, -+ {0x290203, 0x0}, -+ {0x290205, 0x0}, -+ {0x290206, 0x0}, -+ {0x290207, 0x0}, -+ {0x290208, 0x0}, -+ {0x220020, 0x0}, -+ {0x20077, 0x0}, -+ {0x20072, 0x0}, -+ {0x20073, 0x0}, -+ {0x400c0, 0x0}, -+ {0x10040, 0x0}, -+ {0x10140, 0x0}, -+ {0x10240, 0x0}, -+ {0x10340, 0x0}, -+ {0x10440, 0x0}, -+ {0x10540, 0x0}, -+ {0x10640, 0x0}, -+ {0x10740, 0x0}, -+ {0x10840, 0x0}, -+ {0x11040, 0x0}, -+ {0x11140, 0x0}, -+ {0x11240, 0x0}, -+ {0x11340, 0x0}, -+ {0x11440, 0x0}, -+ {0x11540, 0x0}, -+ {0x11640, 0x0}, -+ {0x11740, 0x0}, -+ {0x11840, 0x0}, -+}; -+ -+/* P0 message block parameter for training firmware */ -+static struct dram_cfg_param ddr_fsp0_cfg[] = { -+ {0xd0000, 0x0}, -+ {0x54003, 0xe94}, -+ {0x54004, 0x4}, -+ {0x54006, 0x15}, -+ {0x54008, 0x131f}, -+ {0x54009, 0xc8}, -+ {0x5400b, 0x4}, -+ {0x5400d, 0x100}, -+ {0x5400f, 0x100}, -+ {0x54012, 0x110}, -+ {0x54019, 0x36e4}, -+ {0x5401a, 0x32}, -+ {0x5401b, 0x1146}, -+ {0x5401c, 0x1108}, -+ {0x5401e, 0x4}, -+ {0x5401f, 0x36e4}, -+ {0x54020, 0x32}, -+ {0x54021, 0x1146}, -+ {0x54022, 0x1108}, -+ {0x54024, 0x4}, -+ {0x54032, 0xe400}, -+ {0x54033, 0x3236}, -+ {0x54034, 0x4600}, -+ {0x54035, 0x811}, -+ {0x54036, 0x11}, -+ {0x54037, 0x400}, -+ {0x54038, 0xe400}, -+ {0x54039, 0x3236}, -+ {0x5403a, 0x4600}, -+ {0x5403b, 0x811}, -+ {0x5403c, 0x11}, -+ {0x5403d, 0x400}, -+ {0xd0000, 0x1} -+}; -+ -+/* P0 2D message block parameter for training firmware */ -+static struct dram_cfg_param ddr_fsp0_2d_cfg[] = { -+ {0xd0000, 0x0}, -+ {0x54003, 0xe94}, -+ {0x54004, 0x4}, -+ {0x54006, 0x15}, -+ {0x54008, 0x61}, -+ {0x54009, 0xc8}, -+ {0x5400b, 0x4}, -+ {0x5400d, 0x100}, -+ {0x5400f, 0x100}, -+ {0x54010, 0x2080}, -+ {0x54012, 0x110}, -+ {0x54019, 0x36e4}, -+ {0x5401a, 0x32}, -+ {0x5401b, 0x1146}, -+ {0x5401c, 0x1108}, -+ {0x5401e, 0x4}, -+ {0x5401f, 0x36e4}, -+ {0x54020, 0x32}, -+ {0x54021, 0x1146}, -+ {0x54022, 0x1108}, -+ {0x54024, 0x4}, -+ {0x54032, 0xe400}, -+ {0x54033, 0x3236}, -+ {0x54034, 0x4600}, -+ {0x54035, 0x811}, -+ {0x54036, 0x11}, -+ {0x54037, 0x400}, -+ {0x54038, 0xe400}, -+ {0x54039, 0x3236}, -+ {0x5403a, 0x4600}, -+ {0x5403b, 0x811}, -+ {0x5403c, 0x11}, -+ {0x5403d, 0x400}, -+ {0xd0000, 0x1} -+}; -+ -+/* DRAM PHY init engine image */ -+static struct dram_cfg_param ddr_phy_pie[] = { -+ {0xd0000, 0x0}, -+ {0x90000, 0x10}, -+ {0x90001, 0x400}, -+ {0x90002, 0x10e}, -+ {0x90003, 0x0}, -+ {0x90004, 0x0}, -+ {0x90005, 0x8}, -+ {0x90029, 0xb}, -+ {0x9002a, 0x480}, -+ {0x9002b, 0x109}, -+ {0x9002c, 0x8}, -+ {0x9002d, 0x448}, -+ {0x9002e, 0x139}, -+ {0x9002f, 0x8}, -+ {0x90030, 0x478}, -+ {0x90031, 0x109}, -+ {0x90032, 0x0}, -+ {0x90033, 0xe8}, -+ {0x90034, 0x109}, -+ {0x90035, 0x2}, -+ {0x90036, 0x10}, -+ {0x90037, 0x139}, -+ {0x90038, 0xb}, -+ {0x90039, 0x7c0}, -+ {0x9003a, 0x139}, -+ {0x9003b, 0x44}, -+ {0x9003c, 0x633}, -+ {0x9003d, 0x159}, -+ {0x9003e, 0x14f}, -+ {0x9003f, 0x630}, -+ {0x90040, 0x159}, -+ {0x90041, 0x47}, -+ {0x90042, 0x633}, -+ {0x90043, 0x149}, -+ {0x90044, 0x4f}, -+ {0x90045, 0x633}, -+ {0x90046, 0x179}, -+ {0x90047, 0x8}, -+ {0x90048, 0xe0}, -+ {0x90049, 0x109}, -+ {0x9004a, 0x0}, -+ {0x9004b, 0x7c8}, -+ {0x9004c, 0x109}, -+ {0x9004d, 0x0}, -+ {0x9004e, 0x1}, -+ {0x9004f, 0x8}, -+ {0x90050, 0x30}, -+ {0x90051, 0x65a}, -+ {0x90052, 0x9}, -+ {0x90053, 0x0}, -+ {0x90054, 0x45a}, -+ {0x90055, 0x9}, -+ {0x90056, 0x0}, -+ {0x90057, 0x448}, -+ {0x90058, 0x109}, -+ {0x90059, 0x40}, -+ {0x9005a, 0x633}, -+ {0x9005b, 0x179}, -+ {0x9005c, 0x1}, -+ {0x9005d, 0x618}, -+ {0x9005e, 0x109}, -+ {0x9005f, 0x40c0}, -+ {0x90060, 0x633}, -+ {0x90061, 0x149}, -+ {0x90062, 0x8}, -+ {0x90063, 0x4}, -+ {0x90064, 0x48}, -+ {0x90065, 0x4040}, -+ {0x90066, 0x633}, -+ {0x90067, 0x149}, -+ {0x90068, 0x0}, -+ {0x90069, 0x4}, -+ {0x9006a, 0x48}, -+ {0x9006b, 0x40}, -+ {0x9006c, 0x633}, -+ {0x9006d, 0x149}, -+ {0x9006e, 0x0}, -+ {0x9006f, 0x658}, -+ {0x90070, 0x109}, -+ {0x90071, 0x10}, -+ {0x90072, 0x4}, -+ {0x90073, 0x18}, -+ {0x90074, 0x0}, -+ {0x90075, 0x4}, -+ {0x90076, 0x78}, -+ {0x90077, 0x549}, -+ {0x90078, 0x633}, -+ {0x90079, 0x159}, -+ {0x9007a, 0xd49}, -+ {0x9007b, 0x633}, -+ {0x9007c, 0x159}, -+ {0x9007d, 0x94a}, -+ {0x9007e, 0x633}, -+ {0x9007f, 0x159}, -+ {0x90080, 0x441}, -+ {0x90081, 0x633}, -+ {0x90082, 0x149}, -+ {0x90083, 0x42}, -+ {0x90084, 0x633}, -+ {0x90085, 0x149}, -+ {0x90086, 0x1}, -+ {0x90087, 0x633}, -+ {0x90088, 0x149}, -+ {0x90089, 0x0}, -+ {0x9008a, 0xe0}, -+ {0x9008b, 0x109}, -+ {0x9008c, 0xa}, -+ {0x9008d, 0x10}, -+ {0x9008e, 0x109}, -+ {0x9008f, 0x9}, -+ {0x90090, 0x3c0}, -+ {0x90091, 0x149}, -+ {0x90092, 0x9}, -+ {0x90093, 0x3c0}, -+ {0x90094, 0x159}, -+ {0x90095, 0x18}, -+ {0x90096, 0x10}, -+ {0x90097, 0x109}, -+ {0x90098, 0x0}, -+ {0x90099, 0x3c0}, -+ {0x9009a, 0x109}, -+ {0x9009b, 0x18}, -+ {0x9009c, 0x4}, -+ {0x9009d, 0x48}, -+ {0x9009e, 0x18}, -+ {0x9009f, 0x4}, -+ {0x900a0, 0x58}, -+ {0x900a1, 0xb}, -+ {0x900a2, 0x10}, -+ {0x900a3, 0x109}, -+ {0x900a4, 0x1}, -+ {0x900a5, 0x10}, -+ {0x900a6, 0x109}, -+ {0x900a7, 0x5}, -+ {0x900a8, 0x7c0}, -+ {0x900a9, 0x109}, -+ {0x40000, 0x811}, -+ {0x40020, 0x880}, -+ {0x40040, 0x0}, -+ {0x40060, 0x0}, -+ {0x40001, 0x4008}, -+ {0x40021, 0x83}, -+ {0x40041, 0x4f}, -+ {0x40061, 0x0}, -+ {0x40002, 0x4040}, -+ {0x40022, 0x83}, -+ {0x40042, 0x51}, -+ {0x40062, 0x0}, -+ {0x40003, 0x811}, -+ {0x40023, 0x880}, -+ {0x40043, 0x0}, -+ {0x40063, 0x0}, -+ {0x40004, 0x720}, -+ {0x40024, 0xf}, -+ {0x40044, 0x1740}, -+ {0x40064, 0x0}, -+ {0x40005, 0x16}, -+ {0x40025, 0x83}, -+ {0x40045, 0x4b}, -+ {0x40065, 0x0}, -+ {0x40006, 0x716}, -+ {0x40026, 0xf}, -+ {0x40046, 0x2001}, -+ {0x40066, 0x0}, -+ {0x40007, 0x716}, -+ {0x40027, 0xf}, -+ {0x40047, 0x2800}, -+ {0x40067, 0x0}, -+ {0x40008, 0x716}, -+ {0x40028, 0xf}, -+ {0x40048, 0xf00}, -+ {0x40068, 0x0}, -+ {0x40009, 0x720}, -+ {0x40029, 0xf}, -+ {0x40049, 0x1400}, -+ {0x40069, 0x0}, -+ {0x4000a, 0xe08}, -+ {0x4002a, 0xc15}, -+ {0x4004a, 0x0}, -+ {0x4006a, 0x0}, -+ {0x4000b, 0x625}, -+ {0x4002b, 0x15}, -+ {0x4004b, 0x0}, -+ {0x4006b, 0x0}, -+ {0x4000c, 0x4028}, -+ {0x4002c, 0x80}, -+ {0x4004c, 0x0}, -+ {0x4006c, 0x0}, -+ {0x4000d, 0xe08}, -+ {0x4002d, 0xc1a}, -+ {0x4004d, 0x0}, -+ {0x4006d, 0x0}, -+ {0x4000e, 0x625}, -+ {0x4002e, 0x1a}, -+ {0x4004e, 0x0}, -+ {0x4006e, 0x0}, -+ {0x4000f, 0x4040}, -+ {0x4002f, 0x80}, -+ {0x4004f, 0x0}, -+ {0x4006f, 0x0}, -+ {0x40010, 0x2604}, -+ {0x40030, 0x15}, -+ {0x40050, 0x0}, -+ {0x40070, 0x0}, -+ {0x40011, 0x708}, -+ {0x40031, 0x5}, -+ {0x40051, 0x0}, -+ {0x40071, 0x2002}, -+ {0x40012, 0x8}, -+ {0x40032, 0x80}, -+ {0x40052, 0x0}, -+ {0x40072, 0x0}, -+ {0x40013, 0x2604}, -+ {0x40033, 0x1a}, -+ {0x40053, 0x0}, -+ {0x40073, 0x0}, -+ {0x40014, 0x708}, -+ {0x40034, 0xa}, -+ {0x40054, 0x0}, -+ {0x40074, 0x2002}, -+ {0x40015, 0x4040}, -+ {0x40035, 0x80}, -+ {0x40055, 0x0}, -+ {0x40075, 0x0}, -+ {0x40016, 0x60a}, -+ {0x40036, 0x15}, -+ {0x40056, 0x1200}, -+ {0x40076, 0x0}, -+ {0x40017, 0x61a}, -+ {0x40037, 0x15}, -+ {0x40057, 0x1300}, -+ {0x40077, 0x0}, -+ {0x40018, 0x60a}, -+ {0x40038, 0x1a}, -+ {0x40058, 0x1200}, -+ {0x40078, 0x0}, -+ {0x40019, 0x642}, -+ {0x40039, 0x1a}, -+ {0x40059, 0x1300}, -+ {0x40079, 0x0}, -+ {0x4001a, 0x4808}, -+ {0x4003a, 0x880}, -+ {0x4005a, 0x0}, -+ {0x4007a, 0x0}, -+ {0x900aa, 0x0}, -+ {0x900ab, 0x790}, -+ {0x900ac, 0x11a}, -+ {0x900ad, 0x8}, -+ {0x900ae, 0x7aa}, -+ {0x900af, 0x2a}, -+ {0x900b0, 0x10}, -+ {0x900b1, 0x7b2}, -+ {0x900b2, 0x2a}, -+ {0x900b3, 0x0}, -+ {0x900b4, 0x7c8}, -+ {0x900b5, 0x109}, -+ {0x900b6, 0x10}, -+ {0x900b7, 0x10}, -+ {0x900b8, 0x109}, -+ {0x900b9, 0x10}, -+ {0x900ba, 0x2a8}, -+ {0x900bb, 0x129}, -+ {0x900bc, 0x8}, -+ {0x900bd, 0x370}, -+ {0x900be, 0x129}, -+ {0x900bf, 0xa}, -+ {0x900c0, 0x3c8}, -+ {0x900c1, 0x1a9}, -+ {0x900c2, 0xc}, -+ {0x900c3, 0x408}, -+ {0x900c4, 0x199}, -+ {0x900c5, 0x14}, -+ {0x900c6, 0x790}, -+ {0x900c7, 0x11a}, -+ {0x900c8, 0x8}, -+ {0x900c9, 0x4}, -+ {0x900ca, 0x18}, -+ {0x900cb, 0xe}, -+ {0x900cc, 0x408}, -+ {0x900cd, 0x199}, -+ {0x900ce, 0x8}, -+ {0x900cf, 0x8568}, -+ {0x900d0, 0x108}, -+ {0x900d1, 0x18}, -+ {0x900d2, 0x790}, -+ {0x900d3, 0x16a}, -+ {0x900d4, 0x8}, -+ {0x900d5, 0x1d8}, -+ {0x900d6, 0x169}, -+ {0x900d7, 0x10}, -+ {0x900d8, 0x8558}, -+ {0x900d9, 0x168}, -+ {0x900da, 0x1ff8}, -+ {0x900db, 0x85a8}, -+ {0x900dc, 0x1e8}, -+ {0x900dd, 0x50}, -+ {0x900de, 0x798}, -+ {0x900df, 0x16a}, -+ {0x900e0, 0x60}, -+ {0x900e1, 0x7a0}, -+ {0x900e2, 0x16a}, -+ {0x900e3, 0x8}, -+ {0x900e4, 0x8310}, -+ {0x900e5, 0x168}, -+ {0x900e6, 0x8}, -+ {0x900e7, 0xa310}, -+ {0x900e8, 0x168}, -+ {0x900e9, 0xa}, -+ {0x900ea, 0x408}, -+ {0x900eb, 0x169}, -+ {0x900ec, 0x6e}, -+ {0x900ed, 0x0}, -+ {0x900ee, 0x68}, -+ {0x900ef, 0x0}, -+ {0x900f0, 0x408}, -+ {0x900f1, 0x169}, -+ {0x900f2, 0x0}, -+ {0x900f3, 0x8310}, -+ {0x900f4, 0x168}, -+ {0x900f5, 0x0}, -+ {0x900f6, 0xa310}, -+ {0x900f7, 0x168}, -+ {0x900f8, 0x1ff8}, -+ {0x900f9, 0x85a8}, -+ {0x900fa, 0x1e8}, -+ {0x900fb, 0x68}, -+ {0x900fc, 0x798}, -+ {0x900fd, 0x16a}, -+ {0x900fe, 0x78}, -+ {0x900ff, 0x7a0}, -+ {0x90100, 0x16a}, -+ {0x90101, 0x68}, -+ {0x90102, 0x790}, -+ {0x90103, 0x16a}, -+ {0x90104, 0x8}, -+ {0x90105, 0x8b10}, -+ {0x90106, 0x168}, -+ {0x90107, 0x8}, -+ {0x90108, 0xab10}, -+ {0x90109, 0x168}, -+ {0x9010a, 0xa}, -+ {0x9010b, 0x408}, -+ {0x9010c, 0x169}, -+ {0x9010d, 0x58}, -+ {0x9010e, 0x0}, -+ {0x9010f, 0x68}, -+ {0x90110, 0x0}, -+ {0x90111, 0x408}, -+ {0x90112, 0x169}, -+ {0x90113, 0x0}, -+ {0x90114, 0x8b10}, -+ {0x90115, 0x168}, -+ {0x90116, 0x1}, -+ {0x90117, 0xab10}, -+ {0x90118, 0x168}, -+ {0x90119, 0x0}, -+ {0x9011a, 0x1d8}, -+ {0x9011b, 0x169}, -+ {0x9011c, 0x80}, -+ {0x9011d, 0x790}, -+ {0x9011e, 0x16a}, -+ {0x9011f, 0x18}, -+ {0x90120, 0x7aa}, -+ {0x90121, 0x6a}, -+ {0x90122, 0xa}, -+ {0x90123, 0x0}, -+ {0x90124, 0x1e9}, -+ {0x90125, 0x8}, -+ {0x90126, 0x8080}, -+ {0x90127, 0x108}, -+ {0x90128, 0xf}, -+ {0x90129, 0x408}, -+ {0x9012a, 0x169}, -+ {0x9012b, 0xc}, -+ {0x9012c, 0x0}, -+ {0x9012d, 0x68}, -+ {0x9012e, 0x9}, -+ {0x9012f, 0x0}, -+ {0x90130, 0x1a9}, -+ {0x90131, 0x0}, -+ {0x90132, 0x408}, -+ {0x90133, 0x169}, -+ {0x90134, 0x0}, -+ {0x90135, 0x8080}, -+ {0x90136, 0x108}, -+ {0x90137, 0x8}, -+ {0x90138, 0x7aa}, -+ {0x90139, 0x6a}, -+ {0x9013a, 0x0}, -+ {0x9013b, 0x8568}, -+ {0x9013c, 0x108}, -+ {0x9013d, 0xb7}, -+ {0x9013e, 0x790}, -+ {0x9013f, 0x16a}, -+ {0x90140, 0x1f}, -+ {0x90141, 0x0}, -+ {0x90142, 0x68}, -+ {0x90143, 0x8}, -+ {0x90144, 0x8558}, -+ {0x90145, 0x168}, -+ {0x90146, 0xf}, -+ {0x90147, 0x408}, -+ {0x90148, 0x169}, -+ {0x90149, 0xd}, -+ {0x9014a, 0x0}, -+ {0x9014b, 0x68}, -+ {0x9014c, 0x0}, -+ {0x9014d, 0x408}, -+ {0x9014e, 0x169}, -+ {0x9014f, 0x0}, -+ {0x90150, 0x8558}, -+ {0x90151, 0x168}, -+ {0x90152, 0x8}, -+ {0x90153, 0x3c8}, -+ {0x90154, 0x1a9}, -+ {0x90155, 0x3}, -+ {0x90156, 0x370}, -+ {0x90157, 0x129}, -+ {0x90158, 0x20}, -+ {0x90159, 0x2aa}, -+ {0x9015a, 0x9}, -+ {0x9015b, 0x8}, -+ {0x9015c, 0xe8}, -+ {0x9015d, 0x109}, -+ {0x9015e, 0x0}, -+ {0x9015f, 0x8140}, -+ {0x90160, 0x10c}, -+ {0x90161, 0x10}, -+ {0x90162, 0x8138}, -+ {0x90163, 0x104}, -+ {0x90164, 0x8}, -+ {0x90165, 0x448}, -+ {0x90166, 0x109}, -+ {0x90167, 0xf}, -+ {0x90168, 0x7c0}, -+ {0x90169, 0x109}, -+ {0x9016a, 0x0}, -+ {0x9016b, 0xe8}, -+ {0x9016c, 0x109}, -+ {0x9016d, 0x47}, -+ {0x9016e, 0x630}, -+ {0x9016f, 0x109}, -+ {0x90170, 0x8}, -+ {0x90171, 0x618}, -+ {0x90172, 0x109}, -+ {0x90173, 0x8}, -+ {0x90174, 0xe0}, -+ {0x90175, 0x109}, -+ {0x90176, 0x0}, -+ {0x90177, 0x7c8}, -+ {0x90178, 0x109}, -+ {0x90179, 0x8}, -+ {0x9017a, 0x8140}, -+ {0x9017b, 0x10c}, -+ {0x9017c, 0x0}, -+ {0x9017d, 0x478}, -+ {0x9017e, 0x109}, -+ {0x9017f, 0x0}, -+ {0x90180, 0x1}, -+ {0x90181, 0x8}, -+ {0x90182, 0x8}, -+ {0x90183, 0x4}, -+ {0x90184, 0x0}, -+ {0x90006, 0x8}, -+ {0x90007, 0x7c8}, -+ {0x90008, 0x109}, -+ {0x90009, 0x0}, -+ {0x9000a, 0x400}, -+ {0x9000b, 0x106}, -+ {0xd00e7, 0x400}, -+ {0x90017, 0x0}, -+ {0x9001f, 0x2b}, -+ {0x90026, 0x69}, -+ {0x400d0, 0x0}, -+ {0x400d1, 0x101}, -+ {0x400d2, 0x105}, -+ {0x400d3, 0x107}, -+ {0x400d4, 0x10f}, -+ {0x400d5, 0x202}, -+ {0x400d6, 0x20a}, -+ {0x400d7, 0x20b}, -+ {0x2003a, 0x2}, -+ {0x200be, 0x3}, -+ {0x2000b, 0x41a}, -+ {0x2000c, 0xe9}, -+ {0x2000d, 0x91c}, -+ {0x2000e, 0x2c}, -+ {0x12000b, 0x20d}, -+ {0x12000c, 0x74}, -+ {0x12000d, 0x48e}, -+ {0x12000e, 0x2c}, -+ {0x22000b, 0xb0}, -+ {0x22000c, 0x27}, -+ {0x22000d, 0x186}, -+ {0x22000e, 0x10}, -+ {0x9000c, 0x0}, -+ {0x9000d, 0x173}, -+ {0x9000e, 0x60}, -+ {0x9000f, 0x6110}, -+ {0x90010, 0x2152}, -+ {0x90011, 0xdfbd}, -+ {0x90012, 0x2060}, -+ {0x90013, 0x6152}, -+ {0x20010, 0x5a}, -+ {0x20011, 0x3}, -+ {0x120010, 0x5a}, -+ {0x120011, 0x3}, -+ {0x40080, 0xe0}, -+ {0x40081, 0x12}, -+ {0x40082, 0xe0}, -+ {0x40083, 0x12}, -+ {0x40084, 0xe0}, -+ {0x40085, 0x12}, -+ {0x140080, 0xe0}, -+ {0x140081, 0x12}, -+ {0x140082, 0xe0}, -+ {0x140083, 0x12}, -+ {0x140084, 0xe0}, -+ {0x140085, 0x12}, -+ {0x240080, 0xe0}, -+ {0x240081, 0x12}, -+ {0x240082, 0xe0}, -+ {0x240083, 0x12}, -+ {0x240084, 0xe0}, -+ {0x240085, 0x12}, -+ {0x400fd, 0xf}, -+ {0x400f1, 0xe}, -+ {0x10011, 0x1}, -+ {0x10012, 0x1}, -+ {0x10013, 0x180}, -+ {0x10018, 0x1}, -+ {0x10002, 0x6209}, -+ {0x100b2, 0x1}, -+ {0x101b4, 0x1}, -+ {0x102b4, 0x1}, -+ {0x103b4, 0x1}, -+ {0x104b4, 0x1}, -+ {0x105b4, 0x1}, -+ {0x106b4, 0x1}, -+ {0x107b4, 0x1}, -+ {0x108b4, 0x1}, -+ {0x11011, 0x1}, -+ {0x11012, 0x1}, -+ {0x11013, 0x180}, -+ {0x11018, 0x1}, -+ {0x11002, 0x6209}, -+ {0x110b2, 0x1}, -+ {0x111b4, 0x1}, -+ {0x112b4, 0x1}, -+ {0x113b4, 0x1}, -+ {0x114b4, 0x1}, -+ {0x115b4, 0x1}, -+ {0x116b4, 0x1}, -+ {0x117b4, 0x1}, -+ {0x118b4, 0x1}, -+ {0x20089, 0x1}, -+ {0x20088, 0x19}, -+ {0xc0080, 0x0}, -+ {0xd0000, 0x1}, -+}; -+ -+static struct dram_fsp_msg ddr_dram_fsp_msg[] = { -+ { -+ /* P0 3733mts 1D */ -+ .drate = 3733, -+ .fw_type = FW_1D_IMAGE, -+ .fsp_cfg = ddr_fsp0_cfg, -+ .fsp_cfg_num = ARRAY_SIZE(ddr_fsp0_cfg), -+ }, -+ { -+ /* P0 3733mts 2D */ -+ .drate = 3733, -+ .fw_type = FW_2D_IMAGE, -+ .fsp_cfg = ddr_fsp0_2d_cfg, -+ .fsp_cfg_num = ARRAY_SIZE(ddr_fsp0_2d_cfg), -+ }, -+}; -+ -+/* ddr timing config params */ -+struct dram_timing_info frdm_imx93_dram_timing = { -+ .ddrc_cfg = ddr_ddrc_cfg, -+ .ddrc_cfg_num = ARRAY_SIZE(ddr_ddrc_cfg), -+ .ddrphy_cfg = ddr_ddrphy_cfg, -+ .ddrphy_cfg_num = ARRAY_SIZE(ddr_ddrphy_cfg), -+ .fsp_msg = ddr_dram_fsp_msg, -+ .fsp_msg_num = ARRAY_SIZE(ddr_dram_fsp_msg), -+ .ddrphy_trained_csr = ddr_ddrphy_trained_csr, -+ .ddrphy_trained_csr_num = ARRAY_SIZE(ddr_ddrphy_trained_csr), -+ .ddrphy_pie = ddr_phy_pie, -+ .ddrphy_pie_num = ARRAY_SIZE(ddr_phy_pie), -+ .fsp_table = { 3733, }, -+ .fsp_cfg = ddr_dram_fsp_cfg, -+ .fsp_cfg_num = ARRAY_SIZE(ddr_dram_fsp_cfg), -+}; -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 6612a51452..f06e4af319 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -169,6 +169,7 @@ lwl-$(CONFIG_MACH_NXP_IMX8MM_EVK) += imx8mm-evk.dtb.o imx8mm-evkb.dtb.o - lwl-$(CONFIG_MACH_NXP_IMX8MN_EVK) += imx8mn-evk.dtb.o imx8mn-ddr4-evk.dtb.o - lwl-$(CONFIG_MACH_NXP_IMX8MP_EVK) += imx8mp-evk.dtb.o - lwl-$(CONFIG_MACH_NXP_IMX8MQ_EVK) += imx8mq-evk.dtb.o -+lwl-$(CONFIG_MACH_NXP_IMX93_FRDM) += imx93-frdm.dtb.o - lwl-$(CONFIG_MACH_INNOCOMM_WB15) += imx8mm-innocomm-wb15-evk.dtb.o - lwl-$(CONFIG_MACH_TQ_MBA8MPXL) += imx8mp-tqma8mpql-mba8mpxl.dtb.o - lwl-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += tegra20-colibri-iris.dtb.o -diff --git a/arch/arm/dts/imx93-frdm.dts b/arch/arm/dts/imx93-frdm.dts -new file mode 100644 -index 0000000000..da828abf22 ---- /dev/null -+++ b/arch/arm/dts/imx93-frdm.dts -@@ -0,0 +1,534 @@ -+// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) -+/dts-v1/; -+ -+#include <dt-bindings/usb/pd.h> -+#include <arm64/freescale/imx93.dtsi> -+ -+/ { -+ compatible = "fsl,imx93-11x11-frdm", "fsl,imx93"; -+ model = "NXP i.MX93 11X11 FRDM board"; -+ -+ aliases { -+ mmc0 = &usdhc1; /* EMMC */ -+ mmc1 = &usdhc2; /* uSD */ -+ rtc0 = &pcf2131; -+ serial0 = &lpuart1; -+ }; -+ -+ chosen { -+ stdout-path = &lpuart1; -+ }; -+ -+ reg_vref_1v8: regulator-adc-vref { -+ compatible = "regulator-fixed"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-name = "vref_1v8"; -+ }; -+ -+ reg_can2_standby: regulator-can2-stby { -+ compatible = "regulator-fixed"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-name = "can2-stby"; -+ gpio = <&pcal6524 23 GPIO_ACTIVE_LOW>; -+ }; -+ -+ reg_usdhc2_vmmc: regulator-usdhc2 { -+ compatible = "regulator-fixed"; -+ off-on-delay-us = <12000>; -+ pinctrl-0 = <&pinctrl_reg_usdhc2_vmmc>; -+ pinctrl-names = "default"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-name = "VSD_3V3"; -+ gpio = <&gpio3 7 GPIO_ACTIVE_HIGH>; -+ enable-active-high; -+ }; -+}; -+ -+&eqos { -+ phy-handle = <ðphy1>; -+ phy-mode = "rgmii-id"; -+ pinctrl-0 = <&pinctrl_eqos>; -+ pinctrl-1 = <&pinctrl_eqos_sleep>; -+ pinctrl-names = "default", "sleep"; -+ status = "okay"; -+ -+ mdio { -+ compatible = "snps,dwmac-mdio"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ clock-frequency = <5000000>; -+ -+ ethphy1: ethernet-phy@1 { -+ reg = <1>; -+ reset-assert-us = <10000>; -+ reset-deassert-us = <80000>; -+ reset-gpios = <&pcal6524 15 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+}; -+ -+&fec { -+ phy-handle = <ðphy2>; -+ phy-mode = "rgmii-id"; -+ pinctrl-0 = <&pinctrl_fec>; -+ pinctrl-1 = <&pinctrl_fec_sleep>; -+ pinctrl-names = "default", "sleep"; -+ fsl,magic-packet; -+ status = "okay"; -+ -+ mdio { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ clock-frequency = <5000000>; -+ -+ ethphy2: ethernet-phy@2 { -+ reg = <2>; -+ eee-broken-1000t; -+ reset-assert-us = <10000>; -+ reset-deassert-us = <80000>; -+ reset-gpios = <&pcal6524 16 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+}; -+ -+&lpi2c2 { -+ clock-frequency = <400000>; -+ pinctrl-0 = <&pinctrl_lpi2c2>; -+ pinctrl-names = "default"; -+ status = "okay"; -+ -+ pcal6524: gpio@22 { -+ compatible = "nxp,pcal6524"; -+ reg = <0x22>; -+ #interrupt-cells = <2>; -+ interrupt-controller; -+ interrupt-parent = <&gpio3>; -+ interrupts = <27 IRQ_TYPE_LEVEL_LOW>; -+ #gpio-cells = <2>; -+ gpio-controller; -+ pinctrl-0 = <&pinctrl_pcal6524>; -+ pinctrl-names = "default"; -+ }; -+ -+ pmic@25 { -+ compatible = "nxp,pca9451a"; -+ reg = <0x25>; -+ interrupt-parent = <&pcal6524>; -+ interrupts = <11 IRQ_TYPE_EDGE_FALLING>; -+ -+ regulators { -+ -+ buck1: BUCK1 { -+ regulator-name = "BUCK1"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <650000>; -+ regulator-max-microvolt = <2237500>; -+ regulator-ramp-delay = <3125>; -+ }; -+ -+ buck2: BUCK2 { -+ regulator-name = "BUCK2"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <600000>; -+ regulator-max-microvolt = <2187500>; -+ regulator-ramp-delay = <3125>; -+ }; -+ -+ buck4: BUCK4 { -+ regulator-name = "BUCK4"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <600000>; -+ regulator-max-microvolt = <3400000>; -+ }; -+ -+ buck5: BUCK5 { -+ regulator-name = "BUCK5"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <600000>; -+ regulator-max-microvolt = <3400000>; -+ }; -+ -+ buck6: BUCK6 { -+ regulator-name = "BUCK6"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <600000>; -+ regulator-max-microvolt = <3400000>; -+ }; -+ -+ ldo1: LDO1 { -+ regulator-name = "LDO1"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <1600000>; -+ regulator-max-microvolt = <3300000>; -+ }; -+ -+ ldo4: LDO4 { -+ regulator-name = "LDO4"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <800000>; -+ regulator-max-microvolt = <3300000>; -+ }; -+ -+ ldo5: LDO5 { -+ regulator-name = "LDO5"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <3300000>; -+ }; -+ }; -+ }; -+ -+ eeprom: eeprom@50 { -+ compatible = "atmel,24c256"; -+ reg = <0x50>; -+ pagesize = <64>; -+ }; -+}; -+ -+&lpi2c3 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ clock-frequency = <400000>; -+ pinctrl-0 = <&pinctrl_lpi2c3>; -+ pinctrl-names = "default"; -+ status = "okay"; -+ -+ ptn5110: tcpc@50 { -+ compatible = "nxp,ptn5110", "tcpci"; -+ reg = <0x50>; -+ interrupt-parent = <&gpio3>; -+ interrupts = <27 IRQ_TYPE_LEVEL_LOW>; -+ -+ typec1_con: connector { -+ compatible = "usb-c-connector"; -+ data-role = "dual"; -+ label = "USB-C"; -+ op-sink-microwatt = <15000000>; -+ power-role = "dual"; -+ self-powered; -+ sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM) -+ PDO_VAR(5000, 20000, 3000)>; -+ source-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>; -+ try-power-role = "sink"; -+ -+ ports { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ port@0 { -+ reg = <0>; -+ -+ typec1_dr_sw: endpoint { -+ remote-endpoint = <&usb1_drd_sw>; -+ }; -+ }; -+ }; -+ }; -+ }; -+ -+ pcf2131: rtc@53 { -+ compatible = "nxp,pcf2131"; -+ reg = <0x53>; -+ interrupt-parent = <&pcal6524>; -+ interrupts = <1 IRQ_TYPE_EDGE_FALLING>; -+ }; -+}; -+ -+&lpuart1 { /* console */ -+ pinctrl-0 = <&pinctrl_uart1>; -+ pinctrl-names = "default"; -+ status = "okay"; -+}; -+ -+&usbotg1 { -+ adp-disable; -+ disable-over-current; -+ dr_mode = "otg"; -+ hnp-disable; -+ srp-disable; -+ usb-role-switch; -+ samsung,picophy-dc-vol-level-adjust = <7>; -+ samsung,picophy-pre-emp-curr-control = <3>; -+ status = "okay"; -+ -+ port { -+ -+ usb1_drd_sw: endpoint { -+ remote-endpoint = <&typec1_dr_sw>; -+ }; -+ }; -+}; -+ -+&usbotg2 { -+ disable-over-current; -+ dr_mode = "host"; -+ samsung,picophy-dc-vol-level-adjust = <7>; -+ samsung,picophy-pre-emp-curr-control = <3>; -+ status = "okay"; -+}; -+ -+&usdhc1 { -+ bus-width = <8>; -+ non-removable; -+ pinctrl-0 = <&pinctrl_usdhc1>; -+ pinctrl-1 = <&pinctrl_usdhc1_100mhz>; -+ pinctrl-2 = <&pinctrl_usdhc1_200mhz>; -+ pinctrl-names = "default", "state_100mhz", "state_200mhz"; -+ status = "okay"; -+}; -+ -+&usdhc2 { -+ bus-width = <4>; -+ cd-gpios = <&gpio3 00 GPIO_ACTIVE_LOW>; -+ no-mmc; -+ no-sdio; -+ pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>; -+ pinctrl-1 = <&pinctrl_usdhc2_100mhz>, <&pinctrl_usdhc2_gpio>; -+ pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>; -+ pinctrl-3 = <&pinctrl_usdhc2_sleep>, <&pinctrl_usdhc2_gpio_sleep>; -+ pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; -+ vmmc-supply = <®_usdhc2_vmmc>; -+ status = "okay"; -+}; -+ -+&wdog3 { -+ status = "okay"; -+}; -+ -+&iomuxc { -+ -+ pinctrl_eqos: eqosgrp { -+ fsl,pins = < -+ MX93_PAD_ENET1_MDC__ENET_QOS_MDC 0x57e -+ MX93_PAD_ENET1_MDIO__ENET_QOS_MDIO 0x57e -+ MX93_PAD_ENET1_RD0__ENET_QOS_RGMII_RD0 0x57e -+ MX93_PAD_ENET1_RD1__ENET_QOS_RGMII_RD1 0x57e -+ MX93_PAD_ENET1_RD2__ENET_QOS_RGMII_RD2 0x57e -+ MX93_PAD_ENET1_RD3__ENET_QOS_RGMII_RD3 0x57e -+ MX93_PAD_ENET1_RXC__CCM_ENET_QOS_CLOCK_GENERATE_RX_CLK 0x58e -+ MX93_PAD_ENET1_RX_CTL__ENET_QOS_RGMII_RX_CTL 0x57e -+ MX93_PAD_ENET1_TD0__ENET_QOS_RGMII_TD0 0x57e -+ MX93_PAD_ENET1_TD1__ENET_QOS_RGMII_TD1 0x57e -+ MX93_PAD_ENET1_TD2__ENET_QOS_RGMII_TD2 0x57e -+ MX93_PAD_ENET1_TD3__ENET_QOS_RGMII_TD3 0x57e -+ MX93_PAD_ENET1_TXC__CCM_ENET_QOS_CLOCK_GENERATE_TX_CLK 0x58e -+ MX93_PAD_ENET1_TX_CTL__ENET_QOS_RGMII_TX_CTL 0x57e -+ >; -+ }; -+ -+ pinctrl_eqos_sleep: eqossleepgrp { -+ fsl,pins = < -+ MX93_PAD_ENET1_MDC__GPIO4_IO00 0x31e -+ MX93_PAD_ENET1_MDIO__GPIO4_IO01 0x31e -+ MX93_PAD_ENET1_RD0__GPIO4_IO10 0x31e -+ MX93_PAD_ENET1_RD1__GPIO4_IO11 0x31e -+ MX93_PAD_ENET1_RD2__GPIO4_IO12 0x31e -+ MX93_PAD_ENET1_RD3__GPIO4_IO13 0x31e -+ MX93_PAD_ENET1_RXC__GPIO4_IO09 0x31e -+ MX93_PAD_ENET1_RX_CTL__GPIO4_IO08 0x31e -+ MX93_PAD_ENET1_TD0__GPIO4_IO05 0x31e -+ MX93_PAD_ENET1_TD1__GPIO4_IO04 0x31e -+ MX93_PAD_ENET1_TD2__GPIO4_IO03 0x31e -+ MX93_PAD_ENET1_TD3__GPIO4_IO02 0x31e -+ MX93_PAD_ENET1_TXC__GPIO4_IO07 0x31e -+ MX93_PAD_ENET1_TX_CTL__GPIO4_IO06 0x31e -+ >; -+ }; -+ -+ pinctrl_fec: fecgrp { -+ fsl,pins = < -+ MX93_PAD_ENET2_MDC__ENET1_MDC 0x57e -+ MX93_PAD_ENET2_MDIO__ENET1_MDIO 0x57e -+ MX93_PAD_ENET2_RD0__ENET1_RGMII_RD0 0x57e -+ MX93_PAD_ENET2_RD1__ENET1_RGMII_RD1 0x57e -+ MX93_PAD_ENET2_RD2__ENET1_RGMII_RD2 0x57e -+ MX93_PAD_ENET2_RD3__ENET1_RGMII_RD3 0x57e -+ MX93_PAD_ENET2_RXC__ENET1_RGMII_RXC 0x58e -+ MX93_PAD_ENET2_RX_CTL__ENET1_RGMII_RX_CTL 0x57e -+ MX93_PAD_ENET2_TD0__ENET1_RGMII_TD0 0x57e -+ MX93_PAD_ENET2_TD1__ENET1_RGMII_TD1 0x57e -+ MX93_PAD_ENET2_TD2__ENET1_RGMII_TD2 0x57e -+ MX93_PAD_ENET2_TD3__ENET1_RGMII_TD3 0x57e -+ MX93_PAD_ENET2_TXC__ENET1_RGMII_TXC 0x58e -+ MX93_PAD_ENET2_TX_CTL__ENET1_RGMII_TX_CTL 0x57e -+ >; -+ }; -+ -+ pinctrl_fec_sleep: fecsleepgrp { -+ fsl,pins = < -+ MX93_PAD_ENET2_MDC__GPIO4_IO14 0x51e -+ MX93_PAD_ENET2_MDIO__GPIO4_IO15 0x51e -+ MX93_PAD_ENET2_RD0__GPIO4_IO24 0x51e -+ MX93_PAD_ENET2_RD1__GPIO4_IO25 0x51e -+ MX93_PAD_ENET2_RD2__GPIO4_IO26 0x51e -+ MX93_PAD_ENET2_RD3__GPIO4_IO27 0x51e -+ MX93_PAD_ENET2_RXC__GPIO4_IO23 0x51e -+ MX93_PAD_ENET2_RX_CTL__GPIO4_IO22 0x51e -+ MX93_PAD_ENET2_TD0__GPIO4_IO19 0x51e -+ MX93_PAD_ENET2_TD1__GPIO4_IO18 0x51e -+ MX93_PAD_ENET2_TD2__GPIO4_IO17 0x51e -+ MX93_PAD_ENET2_TD3__GPIO4_IO16 0x51e -+ MX93_PAD_ENET2_TXC__GPIO4_IO21 0x51e -+ MX93_PAD_ENET2_TX_CTL__GPIO4_IO20 0x51e -+ >; -+ }; -+ -+ pinctrl_lpi2c2: lpi2c2grp { -+ fsl,pins = < -+ MX93_PAD_I2C2_SCL__LPI2C2_SCL 0x40000b9e -+ MX93_PAD_I2C2_SDA__LPI2C2_SDA 0x40000b9e -+ >; -+ }; -+ -+ pinctrl_lpi2c3: lpi2c3grp { -+ fsl,pins = < -+ MX93_PAD_GPIO_IO28__LPI2C3_SDA 0x40000b9e -+ MX93_PAD_GPIO_IO29__LPI2C3_SCL 0x40000b9e -+ >; -+ }; -+ -+ pinctrl_pcal6524: pcal6524grp { -+ fsl,pins = < -+ MX93_PAD_CCM_CLKO2__GPIO3_IO27 0x31e -+ >; -+ }; -+ -+ pinctrl_reg_usdhc2_vmmc: regusdhc2vmmcgrp { -+ fsl,pins = < -+ MX93_PAD_SD2_RESET_B__GPIO3_IO07 0x31e -+ >; -+ }; -+ -+ pinctrl_uart1: uart1grp { -+ fsl,pins = < -+ MX93_PAD_UART1_RXD__LPUART1_RX 0x31e -+ MX93_PAD_UART1_TXD__LPUART1_TX 0x31e -+ >; -+ }; -+ -+ /* need to config the SION for data and cmd pad, refer to ERR052021 */ -+ pinctrl_usdhc1: usdhc1grp { -+ fsl,pins = < -+ MX93_PAD_SD1_CLK__USDHC1_CLK 0x1582 -+ MX93_PAD_SD1_CMD__USDHC1_CMD 0x40001382 -+ MX93_PAD_SD1_DATA0__USDHC1_DATA0 0x40001382 -+ MX93_PAD_SD1_DATA1__USDHC1_DATA1 0x40001382 -+ MX93_PAD_SD1_DATA2__USDHC1_DATA2 0x40001382 -+ MX93_PAD_SD1_DATA3__USDHC1_DATA3 0x40001382 -+ MX93_PAD_SD1_DATA4__USDHC1_DATA4 0x40001382 -+ MX93_PAD_SD1_DATA5__USDHC1_DATA5 0x40001382 -+ MX93_PAD_SD1_DATA6__USDHC1_DATA6 0x40001382 -+ MX93_PAD_SD1_DATA7__USDHC1_DATA7 0x40001382 -+ MX93_PAD_SD1_STROBE__USDHC1_STROBE 0x1582 -+ >; -+ }; -+ -+ /* need to config the SION for data and cmd pad, refer to ERR052021 */ -+ pinctrl_usdhc1_100mhz: usdhc1-100mhzgrp { -+ fsl,pins = < -+ MX93_PAD_SD1_CLK__USDHC1_CLK 0x158e -+ MX93_PAD_SD1_CMD__USDHC1_CMD 0x4000138e -+ MX93_PAD_SD1_DATA0__USDHC1_DATA0 0x4000138e -+ MX93_PAD_SD1_DATA1__USDHC1_DATA1 0x4000138e -+ MX93_PAD_SD1_DATA2__USDHC1_DATA2 0x4000138e -+ MX93_PAD_SD1_DATA3__USDHC1_DATA3 0x4000138e -+ MX93_PAD_SD1_DATA4__USDHC1_DATA4 0x4000138e -+ MX93_PAD_SD1_DATA5__USDHC1_DATA5 0x4000138e -+ MX93_PAD_SD1_DATA6__USDHC1_DATA6 0x4000138e -+ MX93_PAD_SD1_DATA7__USDHC1_DATA7 0x4000138e -+ MX93_PAD_SD1_STROBE__USDHC1_STROBE 0x158e -+ >; -+ }; -+ -+ /* need to config the SION for data and cmd pad, refer to ERR052021 */ -+ pinctrl_usdhc1_200mhz: usdhc1-200mhzgrp { -+ fsl,pins = < -+ MX93_PAD_SD1_CLK__USDHC1_CLK 0x15fe -+ MX93_PAD_SD1_CMD__USDHC1_CMD 0x400013fe -+ MX93_PAD_SD1_DATA0__USDHC1_DATA0 0x400013fe -+ MX93_PAD_SD1_DATA1__USDHC1_DATA1 0x400013fe -+ MX93_PAD_SD1_DATA2__USDHC1_DATA2 0x400013fe -+ MX93_PAD_SD1_DATA3__USDHC1_DATA3 0x400013fe -+ MX93_PAD_SD1_DATA4__USDHC1_DATA4 0x400013fe -+ MX93_PAD_SD1_DATA5__USDHC1_DATA5 0x400013fe -+ MX93_PAD_SD1_DATA6__USDHC1_DATA6 0x400013fe -+ MX93_PAD_SD1_DATA7__USDHC1_DATA7 0x400013fe -+ MX93_PAD_SD1_STROBE__USDHC1_STROBE 0x15fe -+ >; -+ }; -+ -+ pinctrl_usdhc2_gpio: usdhc2gpiogrp { -+ fsl,pins = < -+ MX93_PAD_SD2_CD_B__GPIO3_IO00 0x31e -+ >; -+ }; -+ -+ pinctrl_usdhc2_gpio_sleep: usdhc2gpiosleepgrp { -+ fsl,pins = < -+ MX93_PAD_SD2_CD_B__GPIO3_IO00 0x51e -+ >; -+ }; -+ -+ /* need to config the SION for data and cmd pad, refer to ERR052021 */ -+ pinctrl_usdhc2: usdhc2grp { -+ fsl,pins = < -+ MX93_PAD_SD2_CLK__USDHC2_CLK 0x1582 -+ MX93_PAD_SD2_CMD__USDHC2_CMD 0x40001382 -+ MX93_PAD_SD2_DATA0__USDHC2_DATA0 0x40001382 -+ MX93_PAD_SD2_DATA1__USDHC2_DATA1 0x40001382 -+ MX93_PAD_SD2_DATA2__USDHC2_DATA2 0x40001382 -+ MX93_PAD_SD2_DATA3__USDHC2_DATA3 0x40001382 -+ MX93_PAD_SD2_VSELECT__USDHC2_VSELECT 0x51e -+ >; -+ }; -+ -+ /* need to config the SION for data and cmd pad, refer to ERR052021 */ -+ pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp { -+ fsl,pins = < -+ MX93_PAD_SD2_CLK__USDHC2_CLK 0x158e -+ MX93_PAD_SD2_CMD__USDHC2_CMD 0x4000138e -+ MX93_PAD_SD2_DATA0__USDHC2_DATA0 0x4000138e -+ MX93_PAD_SD2_DATA1__USDHC2_DATA1 0x4000138e -+ MX93_PAD_SD2_DATA2__USDHC2_DATA2 0x4000138e -+ MX93_PAD_SD2_DATA3__USDHC2_DATA3 0x4000138e -+ MX93_PAD_SD2_VSELECT__USDHC2_VSELECT 0x51e -+ >; -+ }; -+ -+ /* need to config the SION for data and cmd pad, refer to ERR052021 */ -+ pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp { -+ fsl,pins = < -+ MX93_PAD_SD2_CLK__USDHC2_CLK 0x15fe -+ MX93_PAD_SD2_CMD__USDHC2_CMD 0x400013fe -+ MX93_PAD_SD2_DATA0__USDHC2_DATA0 0x400013fe -+ MX93_PAD_SD2_DATA1__USDHC2_DATA1 0x400013fe -+ MX93_PAD_SD2_DATA2__USDHC2_DATA2 0x400013fe -+ MX93_PAD_SD2_DATA3__USDHC2_DATA3 0x400013fe -+ MX93_PAD_SD2_VSELECT__USDHC2_VSELECT 0x51e -+ >; -+ }; -+ -+ pinctrl_usdhc2_sleep: usdhc2-sleepgrp { -+ fsl,pins = < -+ MX93_PAD_SD2_CLK__GPIO3_IO01 0x51e -+ MX93_PAD_SD2_CMD__GPIO3_IO02 0x51e -+ MX93_PAD_SD2_DATA0__GPIO3_IO03 0x51e -+ MX93_PAD_SD2_DATA1__GPIO3_IO04 0x51e -+ MX93_PAD_SD2_DATA2__GPIO3_IO05 0x51e -+ MX93_PAD_SD2_DATA3__GPIO3_IO06 0x51e -+ MX93_PAD_SD2_VSELECT__GPIO3_IO19 0x51e -+ >; -+ }; -+}; -+#include "imx93.dtsi" -diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig -index 02b9fb4dac..6e757034ae 100644 ---- a/arch/arm/mach-imx/Kconfig -+++ b/arch/arm/mach-imx/Kconfig -@@ -763,6 +763,15 @@ config MACH_TQMA93XX - select FIRMWARE_IMX93_ATF - select FIRMWARE_IMX_LPDDR4_PMU_TRAIN - -+config MACH_NXP_IMX93_FRDM -+ bool "NXP IMX93 FRDM Board" -+ select ARCH_IMX93 -+ select IMX9_DRAM -+ select I2C -+ select I2C_IMX_LPI2C -+ select FIRMWARE_IMX93_ATF -+ select FIRMWARE_IMX_LPDDR4_PMU_TRAIN -+ - endif - - endmenu -diff --git a/images/Makefile.imx b/images/Makefile.imx -index 93264254e9..7a7f54f8d1 100644 ---- a/images/Makefile.imx -+++ b/images/Makefile.imx -@@ -525,3 +525,7 @@ image-$(CONFIG_MACH_TQMA93XX) += barebox-tqma93xx.img - pblb-$(CONFIG_MACH_PHYTEC_PHYCORE_IMX93) += start_imx93_phyboard_segin - FILE_barebox-phyboard_segin.img = start_imx93_phyboard_segin.pblb.imx9img - image-$(CONFIG_MACH_PHYTEC_PHYCORE_IMX93) += barebox-phyboard_segin.img -+ -+pblb-$(CONFIG_MACH_NXP_IMX93_FRDM) += start_imx93_nxp_mx93_frdm -+FILE_barebox-nxp_mx93_frdm.img = start_imx93_nxp_mx93_frdm.pblb.imx9img -+image-$(CONFIG_MACH_NXP_IMX93_FRDM) += barebox-nxp_mx93_frdm.img --- -2.47.3 - diff --git a/configs/platform-v8a/patches/barebox-2025.07.0/series b/configs/platform-v8a/patches/barebox-2025.07.0/series deleted file mode 100644 index c3b42eb..0000000 --- a/configs/platform-v8a/patches/barebox-2025.07.0/series +++ /dev/null @@ -1,2 +0,0 @@ -0001-common-deep-probe-include-of-for-of_device_id.patch -0002-ARM-boards-i.MX93-Add-NXP-FRDM-i.MX93-support.patch diff --git a/configs/platform-v8a/patches/barebox-2025.11.0/0001-ARM-i-MX93-reinstate-aliases.patch b/configs/platform-v8a/patches/barebox-2025.11.0/0001-ARM-i-MX93-reinstate-aliases.patch new file mode 100644 index 0000000..cbf9969 --- /dev/null +++ b/configs/platform-v8a/patches/barebox-2025.11.0/0001-ARM-i-MX93-reinstate-aliases.patch @@ -0,0 +1,62 @@ +From: Ahmad Fatoum <a.fatoum@pengutronix.de> +Date: Wed, 12 Nov 2025 22:37:26 +0100 +Subject: [PATCH master] ARM: i.MX93: reinstate aliases + +Regrettably, the i.MX93 device trees no longer list aliases in the SoC +dtsi and instead leave it to the boards. This broke native GPIO +controllers on i.MX93 in barebox, because the driver expects aliases for +all device tree platforms. + +Add back the aliases into a barebox override. + +Fixes: 7fdf97ba2464 ("dts: update to v6.18-rc1") +Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> +--- + arch/arm/dts/imx93.dtsi | 37 ++++++++++++++++++++++++++++++++++++- + 1 file changed, 36 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/dts/imx93.dtsi b/arch/arm/dts/imx93.dtsi +index 676819817b32..e1328de67243 100644 +--- a/arch/arm/dts/imx93.dtsi ++++ b/arch/arm/dts/imx93.dtsi +@@ -1,4 +1,39 @@ +-/{ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/ { ++ aliases { ++ gpio0 = &gpio1; ++ gpio1 = &gpio2; ++ gpio2 = &gpio3; ++ gpio3 = &gpio4; ++ i2c0 = &lpi2c1; ++ i2c1 = &lpi2c2; ++ i2c2 = &lpi2c3; ++ i2c3 = &lpi2c4; ++ i2c4 = &lpi2c5; ++ i2c5 = &lpi2c6; ++ i2c6 = &lpi2c7; ++ i2c7 = &lpi2c8; ++ mmc0 = &usdhc1; ++ mmc1 = &usdhc2; ++ mmc2 = &usdhc3; ++ serial0 = &lpuart1; ++ serial1 = &lpuart2; ++ serial2 = &lpuart3; ++ serial3 = &lpuart4; ++ serial4 = &lpuart5; ++ serial5 = &lpuart6; ++ serial6 = &lpuart7; ++ serial7 = &lpuart8; ++ spi0 = &lpspi1; ++ spi1 = &lpspi2; ++ spi2 = &lpspi3; ++ spi3 = &lpspi4; ++ spi4 = &lpspi5; ++ spi5 = &lpspi6; ++ spi6 = &lpspi7; ++ spi7 = &lpspi8; ++ }; ++ + chosen { + barebox,bootsource-mmc0 = &usdhc1; + barebox,bootsource-mmc1 = &usdhc2; diff --git a/configs/platform-v8a/patches/barebox-2025.11.0/series b/configs/platform-v8a/patches/barebox-2025.11.0/series new file mode 100644 index 0000000..fd7918b --- /dev/null +++ b/configs/platform-v8a/patches/barebox-2025.11.0/series @@ -0,0 +1 @@ +0001-ARM-i-MX93-reinstate-aliases.patch diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig index ea4b81f..7509c78 100644 --- a/configs/platform-v8a/platformconfig +++ b/configs/platform-v8a/platformconfig @@ -181,10 +181,10 @@ PTXCONF_COMPILERPREFIX_R5="arm-v7a-linux-gnueabihf-" PTXCONF_BAREBOX_ARCH_STRING="arm" PTXCONF_BAREBOX_DEPENDENCIES=y PTXCONF_BAREBOX=y -PTXCONF_BAREBOX_VERSION="2025.07.0" +PTXCONF_BAREBOX_VERSION="2025.11.0" PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION=y PTXCONF_BAREBOX_BUILDSYSTEM_VERSION="${PTXDIST_VCS_VERSION}" -PTXCONF_BAREBOX_MD5="043d58d05040b16d22c7879ae3c8a11b" +PTXCONF_BAREBOX_MD5="867dea758c6ea8b350bac57009235e88" PTXCONF_BAREBOX_CONFIG="barebox.config" PTXCONF_BAREBOX_FIRMWARE=y PTXCONF_BAREBOX_EXTRA_ENV=y -- 2.47.3 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [DistroKit] [PATCH v2 0/3] Update barebox to newest version 2025-12-02 17:03 [DistroKit] [PATCH v2 0/3] Update barebox to newest version Fabian Pflug ` (2 preceding siblings ...) 2025-12-02 17:03 ` [DistroKit] [PATCH v2 3/3] v8a: barebox: version bump 2025.07.0 " Fabian Pflug @ 2025-12-03 17:38 ` Robert Schwebel 3 siblings, 0 replies; 5+ messages in thread From: Robert Schwebel @ 2025-12-03 17:38 UTC (permalink / raw) To: Fabian Pflug; +Cc: distrokit Series applied to next. On Tue, Dec 02, 2025 at 06:03:35PM +0100, Fabian Pflug wrote: > Updating barebox for the most used platforms to the newest version. > > Signed-off-by: Fabian Pflug <f.pflug@pengutronix.de> > --- > Changes in v2: > - Remove old patches > - Add patch to fix i.MX93 regression > - Link to v1: https://lore.distrokit.org/distrokit/20251202112849.2046517-1-f.pflug@pengutronix.de/T/#t > > --- > Fabian Pflug (3): > v7a: barebox: version bump 2025.06.1 -> 2025.11.0 > v7a_noneon: barebox: version bump 2025.03.0 -> 2025.11.0 > v8a: barebox: version bump 2025.07.0 -> 2025.11.0 > > configs/platform-v7a/barebox-am335x-mlo.config | 158 +- > configs/platform-v7a/barebox-at91.config | 213 +- > configs/platform-v7a/barebox-at91.config.diff | 8 +- > configs/platform-v7a/barebox-common.config | 208 +- > configs/platform-v7a/barebox.config | 220 +- > configs/platform-v7a/platformconfig | 8 +- > configs/platform-v7a_noneon/barebox-at91.config | 242 +- > .../platform-v7a_noneon/barebox-at91.config.diff | 8 +- > configs/platform-v7a_noneon/barebox-common.config | 241 +- > .../platform-v7a_noneon/barebox-vexpress.config | 241 +- > .../barebox-vexpress.config.diff | 4 +- > ...dd-sama5d3-compatible-after-DT-regression.patch | 41 - > .../patches/barebox-2025.03.0/series | 1 - > configs/platform-v7a_noneon/platformconfig | 4 +- > configs/platform-v8a/barebox.config | 166 +- > ...on-deep-probe-include-of-for-of_device_id.patch | 30 - > ...boards-i.MX93-Add-NXP-FRDM-i.MX93-support.patch | 2624 -------------------- > .../platform-v8a/patches/barebox-2025.07.0/series | 2 - > .../0001-ARM-i-MX93-reinstate-aliases.patch | 62 + > .../platform-v8a/patches/barebox-2025.11.0/series | 1 + > configs/platform-v8a/platformconfig | 4 +- > ...-vexpress-increase-barebox-partition-size.patch | 74 - > patches/barebox-2025.06.1/series | 4 - > 23 files changed, 1126 insertions(+), 3438 deletions(-) > --- > base-commit: be001f7cd0b7a1387aea136b6e60587194c1b562 > change-id: 20251202-fpg-barebox_update-9919516e5ff6 > > Best regards, > -- > Fabian Pflug <f.pflug@pengutronix.de> > > > -- Pengutronix e.K. | Dipl.-Ing. Robert Schwebel | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 | ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-12-03 17:38 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2025-12-02 17:03 [DistroKit] [PATCH v2 0/3] Update barebox to newest version Fabian Pflug 2025-12-02 17:03 ` [DistroKit] [PATCH v2 1/3] v7a: barebox: version bump 2025.06.1 -> 2025.11.0 Fabian Pflug 2025-12-02 17:03 ` [DistroKit] [PATCH v2 2/3] v7a_noneon: barebox: version bump 2025.03.0 " Fabian Pflug 2025-12-02 17:03 ` [DistroKit] [PATCH v2 3/3] v8a: barebox: version bump 2025.07.0 " Fabian Pflug 2025-12-03 17:38 ` [DistroKit] [PATCH v2 0/3] Update barebox to newest version Robert Schwebel
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox