Skip to content

Commit 3f0d0f1

Browse files
raajlokaAlif Zakuan Yuslaimi
authored andcommitted
arm: configs: Clean up the defconfigs for agilex, stratix10, arria10 and cv
Previous commits during the uboot 2022.10_RC rebase, the configs were newly added. This causes some test to fail where it cannot boot to uboot SPL. By adding and removing these configs, it fixes the uboot issues. Signed-off-by: Lokanathan, Raaj <raaj.lokanathan@intel.com>
1 parent 270a941 commit 3f0d0f1

File tree

3 files changed

+21
-30
lines changed

3 files changed

+21
-30
lines changed

configs/socfpga_arria10_defconfig

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,6 @@ CONFIG_FIT=y
1919
CONFIG_SPL_FIT=y
2020
CONFIG_DISTRO_DEFAULTS=y
2121
CONFIG_USE_BOOTARGS=y
22-
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
23-
CONFIG_SPL_MAX_SIZE=0x40000
24-
CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
25-
CONFIG_SPL_BSS_START_ADDR=0x3ff00000
26-
# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
27-
CONFIG_SPL_STACK=0xffe3f000
28-
CONFIG_SYS_SPL_MALLOC=y
29-
CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y
30-
CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x3fa00000
31-
CONFIG_SYS_SPL_MALLOC_SIZE=0x500000
32-
CONFIG_SPL_BSS_MAX_SIZE=0x100000
3322
CONFIG_BOOTARGS="console=ttyS0,115200"
3423
CONFIG_BOOTCOMMAND="run fatscript;run prog_core;bridge enable;run distro_bootcmd"
3524
CONFIG_DEFAULT_FDT_FILE="socfpga_arria10_socdk_sdmmc.dtb"

configs/socfpga_arria10_nand_defconfig

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ CONFIG_ENV_OFFSET=0x200000
66
CONFIG_DM_GPIO=y
77
CONFIG_SPL_DRIVERS_MISC=y
88
CONFIG_SPL_TEXT_BASE=0xFFE00000
9+
CONFIG_SYS_MALLOC_LEN=0x4000000
910
CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000
1011
CONFIG_TARGET_SOCFPGA_ARRIA10_SOCDK=y
1112
CONFIG_ENV_OFFSET_REDUND=0x210000
@@ -19,17 +20,6 @@ CONFIG_NAND_BOOT=y
1920
CONFIG_BOOTDELAY=5
2021
CONFIG_USE_BOOTARGS=y
2122
CONFIG_BOOTARGS="console=ttyS0,115200 "
22-
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
23-
CONFIG_SPL_MAX_SIZE=0x40000
24-
CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
25-
CONFIG_SPL_BSS_START_ADDR=0x3ff00000
26-
# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
27-
CONFIG_SPL_STACK=0xffe3f000
28-
CONFIG_SYS_SPL_MALLOC=y
29-
CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y
30-
CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x3fa00000
31-
CONFIG_SYS_SPL_MALLOC_SIZE=0x500000
32-
CONFIG_SPL_BSS_MAX_SIZE=0x100000
3323
CONFIG_USE_BOOTCOMMAND=y
3424
CONFIG_BOOTCOMMAND="bridge enable; run nandload; run nandboot"
3525
CONFIG_DEFAULT_FDT_FILE="socfpga_arria10_socdk_nand.dtb"
@@ -39,8 +29,19 @@ CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
3929
CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
4030
CONFIG_SYS_NAND_U_BOOT_OFFS=0x100000
4131
CONFIG_DISPLAY_BOARDINFO_LATE=y
32+
CONFIG_SPL_PAD_TO=0x40000
33+
CONFIG_SPL_NO_BSS_LIMIT=y
34+
# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
35+
CONFIG_SPL_STACK=0xffe2b000
36+
CONFIG_SYS_SPL_MALLOC=y
37+
CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y
38+
CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0xffe2b000
39+
CONFIG_SYS_SPL_MALLOC_SIZE=0x15000
40+
CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
41+
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xffe2b000
4242
CONFIG_SPL_ENV_SUPPORT=y
4343
CONFIG_SPL_FPGA=y
44+
CONFIG_SYS_MAXARGS=32
4445
CONFIG_SPL_MTD_SUPPORT=y
4546
CONFIG_SPL_NAND_SUPPORT=y
4647
CONFIG_CMD_BOOTZ=y
@@ -59,6 +60,7 @@ CONFIG_CMD_CACHE=y
5960
CONFIG_MTDIDS_DEFAULT="nand0=ffb80000.nand.0"
6061
CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
6162
CONFIG_ENV_IS_IN_NAND=y
63+
CONFIG_ENV_IS_IN_MMC=n
6264
CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
6365
CONFIG_SPL_ENV_IS_NOWHERE=y
6466
CONFIG_VERSION_VARIABLE=y

configs/socfpga_arria10_qspi_defconfig

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,16 @@ CONFIG_SPL_FIT_SOURCE="board/altera/arria10-socdk/fit_spl_uboot.its"
2020
CONFIG_QSPI_BOOT=y
2121
CONFIG_BOOTDELAY=5
2222
CONFIG_USE_BOOTARGS=y
23-
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
24-
CONFIG_SPL_MAX_SIZE=0x40000
25-
CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
26-
CONFIG_SPL_BSS_START_ADDR=0x3ff00000
23+
CONFIG_SPL_PAD_TO=0x40000
24+
CONFIG_SPL_NO_BSS_LIMIT=y
2725
# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
28-
CONFIG_SPL_STACK=0xffe3f000
26+
CONFIG_SPL_STACK=0xffe2b000
2927
CONFIG_SYS_SPL_MALLOC=y
3028
CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y
31-
CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x3fa00000
32-
CONFIG_SYS_SPL_MALLOC_SIZE=0x500000
33-
CONFIG_SPL_BSS_MAX_SIZE=0x100000
29+
CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0xffe2b000
30+
CONFIG_SYS_SPL_MALLOC_SIZE=0x15000
31+
CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
32+
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xffe2b000
3433
CONFIG_BOOTARGS="console=ttyS0,115200 "
3534
CONFIG_USE_BOOTCOMMAND=y
3635
CONFIG_BOOTCOMMAND="bridge enable; run qspiload; run qspiboot"
@@ -41,6 +40,7 @@ CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
4140
CONFIG_DISPLAY_BOARDINFO_LATE=y
4241
CONFIG_SPL_ENV_SUPPORT=y
4342
CONFIG_SPL_FPGA=y
43+
CONFIG_SYS_MAXARGS=32
4444
CONFIG_SPL_SPI_LOAD=y
4545
CONFIG_CMD_BOOTZ=y
4646
CONFIG_CMD_ASKENV=y

0 commit comments

Comments
 (0)