xilinx: Disable SPL_OS_BOOT for Zynq and ZynqMP
The commit 210702ae6c ("spl: spi: fix falcon mode for spi boot") fixed
the logic of spl_start_uboot() where 0 means OS boot and 1 means u-boot.
Zynq/ZynqMP enable OS_BOOT by default but it was never really be used
that's why disable it to boot via U-Boot phase all the time.
Signed-off-by: Michal Simek <michal.simek@amd.com>
This commit is contained in:
@@ -45,15 +45,9 @@ CONFIG_SPL_HAVE_INIT_STACK=y
|
||||
CONFIG_SPL_SYS_MALLOC=y
|
||||
CONFIG_SPL_SYS_MALLOC_SIZE=0x2000000
|
||||
CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"
|
||||
CONFIG_SPL_FS_LOAD_ARGS_NAME="system.dtb"
|
||||
CONFIG_SPL_FPGA=y
|
||||
CONFIG_SPL_OS_BOOT=y
|
||||
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x10000000
|
||||
CONFIG_SPL_SPI_LOAD=y
|
||||
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
|
||||
CONFIG_SYS_SPI_KERNEL_OFFS=0x280000
|
||||
CONFIG_SYS_SPI_ARGS_OFFS=0x200000
|
||||
CONFIG_SYS_SPI_ARGS_SIZE=0x80000
|
||||
CONFIG_SYS_MAXARGS=32
|
||||
# CONFIG_BOOTM_NETBSD is not set
|
||||
CONFIG_CMD_IMLS=y
|
||||
|
||||
@@ -51,17 +51,10 @@ CONFIG_SPL_MAX_SIZE=0x40000
|
||||
# CONFIG_SPL_BINMAN_SYMBOLS is not set
|
||||
# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
|
||||
CONFIG_SPL_HAVE_INIT_STACK=y
|
||||
CONFIG_SPL_FS_LOAD_KERNEL_NAME=""
|
||||
CONFIG_SPL_FS_LOAD_ARGS_NAME=""
|
||||
CONFIG_SPL_FPGA=y
|
||||
CONFIG_SPL_OS_BOOT=y
|
||||
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x8000000
|
||||
CONFIG_SPL_RAM_DEVICE=y
|
||||
CONFIG_SPL_SPI_LOAD=y
|
||||
CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
|
||||
CONFIG_SYS_SPI_KERNEL_OFFS=0x80000
|
||||
CONFIG_SYS_SPI_ARGS_OFFS=0xa0000
|
||||
CONFIG_SYS_SPI_ARGS_SIZE=0xa0000
|
||||
CONFIG_SPL_ATF=y
|
||||
CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
|
||||
CONFIG_CMD_SMBIOS=y
|
||||
|
||||
@@ -48,17 +48,10 @@ CONFIG_SPL_SYS_MALLOC=y
|
||||
CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
|
||||
CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x20000000
|
||||
CONFIG_SPL_SYS_MALLOC_SIZE=0x1000000
|
||||
CONFIG_SPL_FS_LOAD_KERNEL_NAME="atf-uboot.ub"
|
||||
CONFIG_SPL_FS_LOAD_ARGS_NAME="u-boot.bin"
|
||||
CONFIG_SPL_FPGA=y
|
||||
CONFIG_SPL_OS_BOOT=y
|
||||
CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x8000000
|
||||
CONFIG_SPL_RAM_DEVICE=y
|
||||
CONFIG_SPL_SPI_LOAD=y
|
||||
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
|
||||
CONFIG_SYS_SPI_KERNEL_OFFS=0x80000
|
||||
CONFIG_SYS_SPI_ARGS_OFFS=0xa0000
|
||||
CONFIG_SYS_SPI_ARGS_SIZE=0xa0000
|
||||
CONFIG_SPL_ATF=y
|
||||
CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
|
||||
CONFIG_CMD_SMBIOS=y
|
||||
|
||||
Reference in New Issue
Block a user