Re: [PATCH v2 2/9] configs: stratix10: Combine defconfig for all boot flashes

["Yuslaimi, Alif Zakuan" <alif.zakuan.yuslaimi@altera.com>]

Hi Tien Fong,

On 7/5/2026 5:31 pm, Chee, Tien Fong wrote:
> Hi Alif,
> 
> 
> On 28/4/2026 11:48 am, alif.zakuan.yuslaimi@altera.com wrote:
>> From: Alif Zakuan Yuslaimi <alif.zakuan.yuslaimi@altera.com>
>>
>> Combine all MMC and QSPI configs into single defconfig which is named
>> as "socfpga_stratix10_defconfig". This will be the default defconfig to
>> use.
>>
>> This will support booting from all three flashes using ARM Trusted Firmware
>> (ATF) as the secure runtime monitor.
>>
>> Signed-off-by: Alif Zakuan Yuslaimi <alif.zakuan.yuslaimi@altera.com>
>> ---
>>    configs/socfpga_stratix10_atf_defconfig | 90 ----------------------
>>    configs/socfpga_stratix10_defconfig     | 99 +++++++++++++++----------
>>    2 files changed, 58 insertions(+), 131 deletions(-)
>>    delete mode 100644 configs/socfpga_stratix10_atf_defconfig
>>
>> diff --git a/configs/socfpga_stratix10_atf_defconfig b/configs/socfpga_stratix10_atf_defconfig
>> deleted file mode 100644
>> index 206343885d9..00000000000
>> --- a/configs/socfpga_stratix10_atf_defconfig
>> +++ /dev/null
>> @@ -1,90 +0,0 @@
>> -CONFIG_ARM=y
>> -CONFIG_COUNTER_FREQUENCY=400000000
>> -CONFIG_ARCH_SOCFPGA=y
>> -CONFIG_TEXT_BASE=0x200000
>> -CONFIG_SYS_MALLOC_LEN=0x500000
>> -CONFIG_NR_DRAM_BANKS=2
>> -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>> -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
>> -CONFIG_SF_DEFAULT_MODE=0x2003
>> -CONFIG_ENV_SIZE=0x1000
>> -CONFIG_ENV_OFFSET=0x200
>> -CONFIG_DM_GPIO=y
>> -CONFIG_DEFAULT_DEVICE_TREE="socfpga_stratix10_socdk"
>> -CONFIG_DM_RESET=y
>> -CONFIG_SPL_STACK=0xffe3f000
>> -CONFIG_SPL_TEXT_BASE=0xFFE00000
>> -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
>> -CONFIG_SPL_BSS_START_ADDR=0x3ff00000
>> -CONFIG_SPL_BSS_MAX_SIZE=0x100000
>> -CONFIG_SYS_BOOTM_LEN=0x2000000
>> -CONFIG_SYS_LOAD_ADDR=0x02000000
>> -CONFIG_TARGET_SOCFPGA_STRATIX10_SOCDK=y
>> -CONFIG_IDENT_STRING="socfpga_stratix10"
>> -CONFIG_SPL_FS_FAT=y
>> -CONFIG_REMAKE_ELF=y
>> -CONFIG_FIT=y
>> -CONFIG_SPL_FIT_SIGNATURE=y
>> -CONFIG_SPL_LOAD_FIT=y
>> -CONFIG_SPL_LOAD_FIT_ADDRESS=0x02000000
>> -CONFIG_BOOTDELAY=5
>> -CONFIG_USE_BOOTARGS=y
>> -CONFIG_BOOTARGS="earlycon"
>> -CONFIG_USE_BOOTCOMMAND=y
>> -CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; run mmcfitboot"
>> -CONFIG_SYS_PBSIZE=2085
>> -CONFIG_SPL_MAX_SIZE=0x40000
>> -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
>> -CONFIG_SPL_HAVE_INIT_STACK=y
>> -CONFIG_SPL_SYS_MALLOC=y
>> -CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
>> -CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x3fa00000
>> -CONFIG_SPL_SYS_MALLOC_SIZE=0x500000
>> -CONFIG_SPL_SPI_LOAD=y
>> -CONFIG_SYS_SPI_U_BOOT_OFFS=0x02000000
>> -CONFIG_SPL_ATF=y
>> -CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
>> -CONFIG_SPL_TARGET="spl/u-boot-spl-dtb.hex"
>> -CONFIG_HUSH_PARSER=y
>> -CONFIG_SYS_PROMPT="SOCFPGA_STRATIX10 # "
>> -CONFIG_CMD_MEMTEST=y
>> -CONFIG_CMD_GPIO=y
>> -CONFIG_CMD_I2C=y
>> -CONFIG_CMD_MMC=y
>> -CONFIG_CMD_SPI=y
>> -CONFIG_CMD_USB=y
>> -CONFIG_CMD_DHCP=y
>> -CONFIG_CMD_MII=y
>> -CONFIG_CMD_PING=y
>> -CONFIG_CMD_CACHE=y
>> -CONFIG_CMD_EXT4=y
>> -CONFIG_CMD_FAT=y
>> -CONFIG_CMD_FS_GENERIC=y
>> -CONFIG_ENV_IS_IN_MMC=y
>> -CONFIG_ENV_RELOC_GD_ENV_ADDR=y
>> -CONFIG_NET_RANDOM_ETHADDR=y
>> -CONFIG_SPL_DM_SEQ_ALIAS=y
>> -CONFIG_SPL_ALTERA_SDRAM=y
>> -CONFIG_DWAPB_GPIO=y
>> -CONFIG_DM_I2C=y
>> -CONFIG_SYS_I2C_DW=y
>> -CONFIG_SYS_MMC_MAX_BLK_COUNT=256
>> -CONFIG_MMC_DW=y
>> -CONFIG_SPI_FLASH_SPANSION=y
>> -CONFIG_SPI_FLASH_STMICRO=y
>> -CONFIG_PHY_MICREL=y
>> -CONFIG_PHY_MICREL_KSZ90X1=y
>> -CONFIG_ETH_DESIGNWARE=y
>> -CONFIG_MII=y
>> -CONFIG_SYS_NS16550_MEM32=y
>> -CONFIG_SPI=y
>> -CONFIG_CADENCE_QSPI=y
>> -CONFIG_DESIGNWARE_SPI=y
>> -CONFIG_USB=y
>> -CONFIG_USB_DWC2=y
>> -CONFIG_USB_STORAGE=y
>> -CONFIG_DESIGNWARE_WATCHDOG=y
>> -CONFIG_WDT=y
>> -# CONFIG_SPL_USE_TINY_PRINTF is not set
>> -CONFIG_PANIC_HANG=y
>> -CONFIG_SPL_CRC32=y
>> diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig
>> index ef21dc92493..02a1875a72e 100644
>> --- a/configs/socfpga_stratix10_defconfig
>> +++ b/configs/socfpga_stratix10_defconfig
>> @@ -1,93 +1,110 @@
>>    CONFIG_ARM=y
>>    CONFIG_COUNTER_FREQUENCY=400000000
>> +CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds"
>>    CONFIG_ARCH_SOCFPGA=y
>> -CONFIG_TEXT_BASE=0x1000
>> -CONFIG_SYS_MALLOC_LEN=0x500000
>> +CONFIG_TEXT_BASE=0x200000
>> +CONFIG_SYS_MALLOC_F_LEN=0x2000
>>    CONFIG_NR_DRAM_BANKS=2
>> -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>> -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x101000
>> -CONFIG_SF_DEFAULT_MODE=0x2003
>> -CONFIG_ENV_SIZE=0x1000
>> -CONFIG_ENV_OFFSET=0x200
>> +CONFIG_ENV_SIZE=0x2000
>> +CONFIG_ENV_OFFSET=0x04100000
>> +CONFIG_ENV_SECT_SIZE=0x20000
>> +CONFIG_SYS_SPI_U_BOOT_OFFS=0x04000000
>>    CONFIG_DM_GPIO=y
>>    CONFIG_DEFAULT_DEVICE_TREE="altera/socfpga_stratix10_socdk"
>>    CONFIG_OF_UPSTREAM=y
>> -CONFIG_DM_RESET=y
>> -CONFIG_SPL_STACK=0xffe3f000
>>    CONFIG_SPL_TEXT_BASE=0xFFE00000
>> -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
>> -CONFIG_SPL_BSS_START_ADDR=0x3ff00000
>> -CONFIG_SPL_BSS_MAX_SIZE=0x100000
>> -CONFIG_SYS_BOOTM_LEN=0x2000000
>> -CONFIG_SYS_LOAD_ADDR=0x02000000
>>    CONFIG_TARGET_SOCFPGA_STRATIX10_SOCDK=y
>>    CONFIG_IDENT_STRING="socfpga_stratix10"
>>    CONFIG_SPL_FS_FAT=y
>> -# CONFIG_PSCI_RESET is not set
>> -CONFIG_SYS_MEMTEST_START=0x00000000
>> -CONFIG_SYS_MEMTEST_END=0x3fe00000
>> -CONFIG_OPTIMIZE_INLINING=y
>> -CONFIG_SPL_OPTIMIZE_INLINING=y
>> -CONFIG_REMAKE_ELF=y
>> +CONFIG_DISTRO_DEFAULTS=y
>> +CONFIG_FIT=y
>> +CONFIG_SPL_FIT_SIGNATURE=y
>> +CONFIG_SPL_LOAD_FIT=y
>> +CONFIG_SPL_LOAD_FIT_ADDRESS=0x02000000
>> +# CONFIG_USE_SPL_FIT_GENERATOR is not set
>> +CONFIG_QSPI_BOOT=y
>>    CONFIG_BOOTDELAY=5
>>    CONFIG_USE_BOOTARGS=y
>> -CONFIG_BOOTARGS="earlycon"
>> -CONFIG_USE_BOOTCOMMAND=y
>> -CONFIG_BOOTCOMMAND="run fatscript; run mmcload; run linux_qspi_enable; run mmcboot"
>> -CONFIG_SYS_PBSIZE=2085
>> +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
>> +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>> +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
>>    CONFIG_SPL_MAX_SIZE=0x40000
>> +CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
>> +CONFIG_SPL_BSS_START_ADDR=0x3ff00000
>>    # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
>>    CONFIG_SPL_HAVE_INIT_STACK=y
>> +CONFIG_SPL_STACK=0xffe3f000
>>    CONFIG_SPL_SYS_MALLOC=y
>>    CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
>>    CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x3fa00000
>>    CONFIG_SPL_SYS_MALLOC_SIZE=0x500000
>> +CONFIG_SPL_BSS_MAX_SIZE=0x100000
>> +CONFIG_BOOTARGS="earlycon panic=-1"
>> +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> 
> 
> Remove one of the two identical # CONFIG_SPL_RAW_IMAGE_SUPPORT lines.
> Regenerate defconfig with make savedefconfig
> 
> 
Noted, I will clean this up with savedefconfig for v3.

>> +CONFIG_SPL_CRC32=y
>> +CONFIG_SPL_MTD=y
>> +CONFIG_SPL_MTD_SUPPORT=y
>>    CONFIG_SPL_SPI_LOAD=y
>> -CONFIG_SYS_SPI_U_BOOT_OFFS=0x3C00000
>> -CONFIG_SPL_TARGET="spl/u-boot-spl-dtb.hex"
>> -CONFIG_HUSH_PARSER=y
>> +CONFIG_SPL_ATF=y
>> +CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
>>    CONFIG_SYS_PROMPT="SOCFPGA_STRATIX10 # "
>> +CONFIG_CMD_NVEDIT_SELECT=y
>>    CONFIG_CMD_MEMTEST=y
>> +# CONFIG_CMD_FLASH is not set
>>    CONFIG_CMD_GPIO=y
>>    CONFIG_CMD_I2C=y
>>    CONFIG_CMD_MMC=y
>> +CONFIG_CMD_MTD=y
>>    CONFIG_CMD_SPI=y
>>    CONFIG_CMD_USB=y
>> -CONFIG_CMD_WDT=y
>> -CONFIG_CMD_DHCP=y
>> -CONFIG_CMD_MII=y
>> -CONFIG_CMD_PING=y
>>    CONFIG_CMD_CACHE=y
>> -CONFIG_CMD_EXT4=y
>> -CONFIG_CMD_FAT=y
>> -CONFIG_CMD_FS_GENERIC=y
>> -CONFIG_ENV_IS_IN_MMC=y
>> -CONFIG_ENV_RELOC_GD_ENV_ADDR=y
>> -CONFIG_USE_BOOTFILE=y
>> -CONFIG_BOOTFILE="Image"
>> +CONFIG_SPL_SPI_FLASH_MTD=y
>> +CONFIG_SPI_FLASH_MTD=y
>> +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
>> +CONFIG_CMD_UBI=y
>> +CONFIG_CMD_UBIFS=y
>> +CONFIG_MTD_UBI=y
>> +CONFIG_MTD_UBI_WL_THRESHOLD=4096
>> +CONFIG_MTD_UBI_BEB_LIMIT=20
>> +# CONFIG_ISO_PARTITION is not set
>> +# CONFIG_EFI_PARTITION is not set
>> +CONFIG_OF_LIST=""
>> +CONFIG_ENV_IS_IN_FAT=y
>> +CONFIG_ENV_IS_IN_UBI=y
>> +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
>> +CONFIG_ENV_UBI_PART="root"
>> +CONFIG_ENV_UBI_VOLUME="env"
>> +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>>    CONFIG_NET_RANDOM_ETHADDR=y
>>    CONFIG_SPL_DM_SEQ_ALIAS=y
>>    CONFIG_SPL_ALTERA_SDRAM=y
>> +CONFIG_FPGA_INTEL_PR=y
>>    CONFIG_DWAPB_GPIO=y
>>    CONFIG_DM_I2C=y
>>    CONFIG_SYS_I2C_DW=y
>> -CONFIG_SYS_MMC_MAX_BLK_COUNT=256
>> +CONFIG_MISC=y
>>    CONFIG_MMC_DW=y
>> +CONFIG_SYS_MMC_MAX_BLK_COUNT=256
>> +CONFIG_MTD=y
>> +CONFIG_DM_MTD=y
>> +CONFIG_SF_DEFAULT_MODE=0x2003
>>    CONFIG_SPI_FLASH_SPANSION=y
>>    CONFIG_SPI_FLASH_STMICRO=y
>>    CONFIG_PHY_MICREL=y
>>    CONFIG_PHY_MICREL_KSZ90X1=y
>> +CONFIG_DM_ETH=y
>>    CONFIG_ETH_DESIGNWARE=y
>>    CONFIG_MII=y
>> +CONFIG_DM_RESET=y
>>    CONFIG_SYS_NS16550_MEM32=y
>>    CONFIG_SPI=y
>>    CONFIG_CADENCE_QSPI=y
>>    CONFIG_DESIGNWARE_SPI=y
>>    CONFIG_USB=y
>> +CONFIG_DM_USB=y
>>    CONFIG_USB_DWC2=y
>> -CONFIG_USB_STORAGE=y
> 
> 
> missing vs ATF defconfig, why dropping this?
> 
> 
> Best regards,
> 
> Tien Fong
> 
This is not needed to be enabled as CONFIG_DISTRO_DEFAULTS is enabled in 
this defconfig.

CONFIG_DISTRO_DEFAULTS -> BOOT_DEFAULTS_FEATURES -> USB_STORAGE in 
boot/Kconfig

Thanks,
Alif