Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-19 03:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

configs: Enable SPL_FSL_PBL for some LayerScape platforms

Browse source 
In commit <db4080d56dec>, SPL_FSL_PBL is removed from the configs of
some LayerScape platforms. Actually, SPL_FSL_PBL is needed for SD/NAND
boot on LS1021A/LS1043A/LS1046A to create boot binary having SPL binary
in PBI format concatenated with u-boot binary. SPL_FRAMEWORK is used on
these platforms too.

Signed-off-by: Alison Wang <alison.wang@nxp.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
This commit is contained in:
Alison Wang 2019-12-04 06:21:55 +00:00 • committed by Priyanka Jain
parent 3499dd033c
commit 5d168adf2b
21 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/spl/Kconfig
View file

@ -91,20 +91,24 @@ config SPL_SYS_REPORT_STACK_F_USAGE
occurrence of non 0xaa bytes. occurrence of non 0xaa bytes.
This default implementation works for stacks growing down only. This default implementation works for stacks growing down only.
menu "PowerPC SPL Boot options" menu "PowerPC and LayerScape SPL Boot options"
depends on PPC && (SUPPORT_SPL && !SPL_FRAMEWORK)
config SPL_NAND_BOOT config SPL_NAND_BOOT
bool "Load SPL from NAND flash" bool "Load SPL from NAND flash"
depends on PPC && (SUPPORT_SPL && !SPL_FRAMEWORK)
config SPL_MMC_BOOT config SPL_MMC_BOOT
bool "Load SPL from SD Card / eMMC" bool "Load SPL from SD Card / eMMC"
depends on PPC && (SUPPORT_SPL && !SPL_FRAMEWORK)
config SPL_SPI_BOOT config SPL_SPI_BOOT
bool "Load SPL from SPI flash" bool "Load SPL from SPI flash"
depends on PPC && (SUPPORT_SPL && !SPL_FRAMEWORK)
config SPL_FSL_PBL config SPL_FSL_PBL
bool "Create SPL in Freescale PBI format" bool "Create SPL in Freescale PBI format"
depends on (PPC || ARCH_LS1021A || ARCH_LS1043A || ARCH_LS1046A) && \
SUPPORT_SPL
help help
Create boot binary having SPL binary in PBI format concatenated with Create boot binary having SPL binary in PBI format concatenated with
u-boot binary. u-boot binary.

1
configs/ls1021aiot_sdcard_defconfig
View file

@ -7,6 +7,7 @@ CONFIG_ENV_OFFSET=0x100000
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_AHCI=y CONFIG_AHCI=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SD_BOOT,SD_BOOT_QSPI" CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SD_BOOT,SD_BOOT_QSPI"
CONFIG_MISC_INIT_R=y CONFIG_MISC_INIT_R=y

1
configs/ls1021aqds_nand_defconfig
View file

@ -10,6 +10,7 @@ CONFIG_ENV_OFFSET=0x140000
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_AHCI=y CONFIG_AHCI=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y

1
configs/ls1021aqds_sdcard_ifc_defconfig
View file

@ -11,6 +11,7 @@ CONFIG_ENV_OFFSET=0x300000
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_AHCI=y CONFIG_AHCI=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y

1
configs/ls1021aqds_sdcard_qspi_defconfig
View file

@ -11,6 +11,7 @@ CONFIG_ENV_OFFSET=0x300000
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_AHCI=y CONFIG_AHCI=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y

1
configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig
View file

@ -10,6 +10,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT=y CONFIG_FIT=y

1
configs/ls1021atwr_sdcard_ifc_defconfig
View file

@ -10,6 +10,7 @@ CONFIG_ENV_OFFSET=0x300000
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_AHCI=y CONFIG_AHCI=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT=y CONFIG_FIT=y

1
configs/ls1021atwr_sdcard_qspi_defconfig
View file

@ -10,6 +10,7 @@ CONFIG_ENV_OFFSET=0x300000
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_AHCI=y CONFIG_AHCI=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT=y CONFIG_FIT=y

1
configs/ls1043aqds_nand_defconfig
View file

@ -11,6 +11,7 @@ CONFIG_ENV_OFFSET=0x300000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_AHCI=y CONFIG_AHCI=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y

1
configs/ls1043aqds_sdcard_ifc_defconfig
View file

@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x300000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_AHCI=y CONFIG_AHCI=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y

1
configs/ls1043aqds_sdcard_qspi_defconfig
View file

@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x300000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_AHCI=y CONFIG_AHCI=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y

1
configs/ls1043ardb_nand_SECURE_BOOT_defconfig
View file

@ -10,6 +10,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y

1
configs/ls1043ardb_nand_defconfig
View file

@ -10,6 +10,7 @@ CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0x300000 CONFIG_ENV_OFFSET=0x300000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y

1
configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
View file

@ -11,6 +11,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y

1
configs/ls1043ardb_sdcard_defconfig
View file

@ -11,6 +11,7 @@ CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0x300000 CONFIG_ENV_OFFSET=0x300000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y

1
configs/ls1046aqds_nand_defconfig
View file

@ -8,6 +8,7 @@ CONFIG_ENV_OFFSET=0x300000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_AHCI=y CONFIG_AHCI=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y

1
configs/ls1046aqds_sdcard_ifc_defconfig
View file

@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x300000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_AHCI=y CONFIG_AHCI=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y

1
configs/ls1046aqds_sdcard_qspi_defconfig
View file

@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x300000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_AHCI=y CONFIG_AHCI=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y

1
configs/ls1046ardb_emmc_defconfig
View file

@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x300000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_AHCI=y CONFIG_AHCI=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y

1
configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
View file

@ -11,6 +11,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y

1
configs/ls1046ardb_sdcard_defconfig
View file

@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x300000
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_AHCI=y CONFIG_AHCI=y
CONFIG_SPL_FSL_PBL=y
CONFIG_SPL_TEXT_BASE=0x10000000 CONFIG_SPL_TEXT_BASE=0x10000000
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y