mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-28 07:30:26 +09:00
armv8: ls1012ardb: Add TFABOOT support
TFABOOT support includes: - ls1012ardb_tfa_defconfig to be loaded by trusted firmware - environment address and size changes for TFABOOT - define BOOTCOMMAND for TFABOOT - enable PFE validation for secure boot Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com> Signed-off-by: Vinitha V Pillai <vinitha.pillai@nxp.com> Signed-off-by: Pankit Garg <pankit.garg@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
parent
8aa6b17a4d
commit
1f6180dff9
@ -33,6 +33,10 @@ config SYS_LS_PFE_FW_ADDR
|
|||||||
hex "Flash address of PFE firmware"
|
hex "Flash address of PFE firmware"
|
||||||
default 0x40a00000
|
default 0x40a00000
|
||||||
|
|
||||||
|
config SYS_LS_PFE_ESBC_ADDR
|
||||||
|
hex "PFE Firmware HDR Addr"
|
||||||
|
default 0x40700000
|
||||||
|
|
||||||
config DDR_PFE_PHYS_BASEADDR
|
config DDR_PFE_PHYS_BASEADDR
|
||||||
hex "PFE DDR physical base address"
|
hex "PFE DDR physical base address"
|
||||||
default 0x03800000
|
default 0x03800000
|
||||||
|
@ -1,9 +1,11 @@
|
|||||||
LS1012ARDB BOARD
|
LS1012ARDB BOARD
|
||||||
M: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
|
M: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
|
||||||
|
M: Rajesh Bhagat <rajesh.bhagat@nxp.com>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: board/freescale/ls1012ardb/
|
F: board/freescale/ls1012ardb/
|
||||||
F: include/configs/ls1012ardb.h
|
F: include/configs/ls1012ardb.h
|
||||||
F: configs/ls1012ardb_qspi_defconfig
|
F: configs/ls1012ardb_qspi_defconfig
|
||||||
|
F: configs/ls1012ardb_tfa_defconfig
|
||||||
|
|
||||||
M: Sumit Garg <sumit.garg@nxp.com>
|
M: Sumit Garg <sumit.garg@nxp.com>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
@ -87,8 +87,19 @@ int checkboard(void)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_TFABOOT
|
||||||
int dram_init(void)
|
int dram_init(void)
|
||||||
{
|
{
|
||||||
|
gd->ram_size = tfa_get_dram_size();
|
||||||
|
if (!gd->ram_size)
|
||||||
|
gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
int dram_init(void)
|
||||||
|
{
|
||||||
|
#ifndef CONFIG_TFABOOT
|
||||||
static const struct fsl_mmdc_info mparam = {
|
static const struct fsl_mmdc_info mparam = {
|
||||||
0x05180000, /* mdctl */
|
0x05180000, /* mdctl */
|
||||||
0x00030035, /* mdpdc */
|
0x00030035, /* mdpdc */
|
||||||
@ -106,6 +117,7 @@ int dram_init(void)
|
|||||||
};
|
};
|
||||||
|
|
||||||
mmdc_init(&mparam);
|
mmdc_init(&mparam);
|
||||||
|
#endif
|
||||||
|
|
||||||
gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
|
gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
|
||||||
#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)
|
#if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)
|
||||||
@ -115,6 +127,7 @@ int dram_init(void)
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
int board_early_init_f(void)
|
int board_early_init_f(void)
|
||||||
@ -132,7 +145,8 @@ int board_init(void)
|
|||||||
* Set CCI-400 control override register to enable barrier
|
* Set CCI-400 control override register to enable barrier
|
||||||
* transaction
|
* transaction
|
||||||
*/
|
*/
|
||||||
out_le32(&cci->ctrl_ord, CCI400_CTRLORD_EN_BARRIER);
|
if (current_el() == 3)
|
||||||
|
out_le32(&cci->ctrl_ord, CCI400_CTRLORD_EN_BARRIER);
|
||||||
|
|
||||||
#ifdef CONFIG_SYS_FSL_ERRATUM_A010315
|
#ifdef CONFIG_SYS_FSL_ERRATUM_A010315
|
||||||
erratum_a010315();
|
erratum_a010315();
|
||||||
|
59
configs/ls1012ardb_tfa_SECURE_BOOT_defconfig
Normal file
59
configs/ls1012ardb_tfa_SECURE_BOOT_defconfig
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
CONFIG_ARM=y
|
||||||
|
CONFIG_TARGET_LS1012ARDB=y
|
||||||
|
CONFIG_SYS_TEXT_BASE=0x82000000
|
||||||
|
CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
|
||||||
|
CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
|
||||||
|
CONFIG_SECURE_BOOT=y
|
||||||
|
CONFIG_QSPI_AHB_INIT=y
|
||||||
|
CONFIG_AHCI=y
|
||||||
|
CONFIG_DISTRO_DEFAULTS=y
|
||||||
|
CONFIG_NR_DRAM_BANKS=2
|
||||||
|
# CONFIG_SYS_MALLOC_F is not set
|
||||||
|
CONFIG_FIT_VERBOSE=y
|
||||||
|
CONFIG_OF_BOARD_SETUP=y
|
||||||
|
CONFIG_OF_STDOUT_VIA_ALIAS=y
|
||||||
|
CONFIG_TFABOOT=y
|
||||||
|
CONFIG_BOOTDELAY=10
|
||||||
|
CONFIG_USE_BOOTARGS=y
|
||||||
|
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000"
|
||||||
|
# CONFIG_USE_BOOTCOMMAND is not set
|
||||||
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||||
|
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
||||||
|
CONFIG_CMD_GREPENV=y
|
||||||
|
CONFIG_CMD_MEMTEST=y
|
||||||
|
CONFIG_CMD_GPT=y
|
||||||
|
CONFIG_CMD_I2C=y
|
||||||
|
CONFIG_CMD_MMC=y
|
||||||
|
CONFIG_CMD_PCI=y
|
||||||
|
CONFIG_CMD_SF=y
|
||||||
|
CONFIG_CMD_USB=y
|
||||||
|
# CONFIG_CMD_SETEXPR is not set
|
||||||
|
CONFIG_CMD_CACHE=y
|
||||||
|
CONFIG_OF_CONTROL=y
|
||||||
|
CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb"
|
||||||
|
CONFIG_NET_RANDOM_ETHADDR=y
|
||||||
|
CONFIG_DM=y
|
||||||
|
CONFIG_SATA_CEVA=y
|
||||||
|
CONFIG_DM_MMC=y
|
||||||
|
CONFIG_FSL_ESDHC=y
|
||||||
|
CONFIG_DM_SPI_FLASH=y
|
||||||
|
CONFIG_ENV_IS_NOWHERE=y
|
||||||
|
CONFIG_SPI_FLASH=y
|
||||||
|
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
|
||||||
|
CONFIG_E1000=y
|
||||||
|
CONFIG_PCI=y
|
||||||
|
CONFIG_DM_PCI=y
|
||||||
|
CONFIG_DM_PCI_COMPAT=y
|
||||||
|
CONFIG_PCIE_LAYERSCAPE=y
|
||||||
|
CONFIG_DM_SCSI=y
|
||||||
|
CONFIG_SYS_NS16550=y
|
||||||
|
CONFIG_SPI=y
|
||||||
|
CONFIG_DM_SPI=y
|
||||||
|
CONFIG_FSL_DSPI=y
|
||||||
|
CONFIG_USB=y
|
||||||
|
CONFIG_DM_USB=y
|
||||||
|
CONFIG_USB_XHCI_HCD=y
|
||||||
|
CONFIG_USB_XHCI_DWC3=y
|
||||||
|
CONFIG_USB_STORAGE=y
|
||||||
|
CONFIG_RSA=y
|
||||||
|
CONFIG_RSA_SOFTWARE_EXP=y
|
57
configs/ls1012ardb_tfa_defconfig
Normal file
57
configs/ls1012ardb_tfa_defconfig
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
CONFIG_ARM=y
|
||||||
|
CONFIG_TARGET_LS1012ARDB=y
|
||||||
|
CONFIG_SYS_TEXT_BASE=0x82000000
|
||||||
|
CONFIG_QSPI_AHB_INIT=y
|
||||||
|
CONFIG_TFABOOT=y
|
||||||
|
CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
|
||||||
|
CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
|
||||||
|
CONFIG_AHCI=y
|
||||||
|
CONFIG_DISTRO_DEFAULTS=y
|
||||||
|
CONFIG_NR_DRAM_BANKS=2
|
||||||
|
# CONFIG_SYS_MALLOC_F is not set
|
||||||
|
CONFIG_FIT_VERBOSE=y
|
||||||
|
CONFIG_OF_BOARD_SETUP=y
|
||||||
|
CONFIG_OF_STDOUT_VIA_ALIAS=y
|
||||||
|
CONFIG_BOOTDELAY=10
|
||||||
|
CONFIG_USE_BOOTARGS=y
|
||||||
|
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000"
|
||||||
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||||
|
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
||||||
|
CONFIG_CMD_GREPENV=y
|
||||||
|
CONFIG_CMD_MEMTEST=y
|
||||||
|
CONFIG_CMD_GPT=y
|
||||||
|
CONFIG_CMD_I2C=y
|
||||||
|
CONFIG_CMD_MMC=y
|
||||||
|
CONFIG_CMD_PCI=y
|
||||||
|
CONFIG_CMD_SF=y
|
||||||
|
CONFIG_CMD_USB=y
|
||||||
|
# CONFIG_CMD_SETEXPR is not set
|
||||||
|
CONFIG_CMD_CACHE=y
|
||||||
|
CONFIG_OF_CONTROL=y
|
||||||
|
CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb"
|
||||||
|
CONFIG_ENV_IS_IN_SPI_FLASH=y
|
||||||
|
CONFIG_NET_RANDOM_ETHADDR=y
|
||||||
|
CONFIG_DM=y
|
||||||
|
CONFIG_SATA_CEVA=y
|
||||||
|
CONFIG_DM_MMC=y
|
||||||
|
CONFIG_FSL_ESDHC=y
|
||||||
|
CONFIG_DM_SPI_FLASH=y
|
||||||
|
CONFIG_SPI_FLASH=y
|
||||||
|
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
|
||||||
|
CONFIG_FSL_PFE=y
|
||||||
|
CONFIG_DM_ETH=y
|
||||||
|
CONFIG_E1000=y
|
||||||
|
CONFIG_PCI=y
|
||||||
|
CONFIG_DM_PCI=y
|
||||||
|
CONFIG_DM_PCI_COMPAT=y
|
||||||
|
CONFIG_PCIE_LAYERSCAPE=y
|
||||||
|
CONFIG_DM_SCSI=y
|
||||||
|
CONFIG_SYS_NS16550=y
|
||||||
|
CONFIG_SPI=y
|
||||||
|
CONFIG_DM_SPI=y
|
||||||
|
CONFIG_FSL_DSPI=y
|
||||||
|
CONFIG_USB=y
|
||||||
|
CONFIG_DM_USB=y
|
||||||
|
CONFIG_USB_XHCI_HCD=y
|
||||||
|
CONFIG_USB_XHCI_DWC3=y
|
||||||
|
CONFIG_USB_STORAGE=y
|
@ -16,7 +16,11 @@
|
|||||||
|
|
||||||
#define CONFIG_SKIP_LOWLEVEL_INIT
|
#define CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
|
|
||||||
|
#ifdef CONFIG_TFABOOT
|
||||||
|
#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE
|
||||||
|
#else
|
||||||
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_FSL_OCRAM_BASE + 0xfff0)
|
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_FSL_OCRAM_BASE + 0xfff0)
|
||||||
|
#endif
|
||||||
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000)
|
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000)
|
||||||
|
|
||||||
#define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000
|
#define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000
|
||||||
@ -34,7 +38,7 @@
|
|||||||
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024)
|
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024)
|
||||||
|
|
||||||
/*SPI device */
|
/*SPI device */
|
||||||
#ifdef CONFIG_QSPI_BOOT
|
#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_TFABOOT)
|
||||||
#define CONFIG_SYS_QE_FW_IN_SPIFLASH
|
#define CONFIG_SYS_QE_FW_IN_SPIFLASH
|
||||||
#define CONFIG_SYS_FMAN_FW_ADDR 0x400d0000
|
#define CONFIG_SYS_FMAN_FW_ADDR 0x400d0000
|
||||||
#define CONFIG_ENV_SPI_BUS 0
|
#define CONFIG_ENV_SPI_BUS 0
|
||||||
@ -58,7 +62,11 @@
|
|||||||
#define CONFIG_ENV_OVERWRITE
|
#define CONFIG_ENV_OVERWRITE
|
||||||
|
|
||||||
#define CONFIG_ENV_SIZE 0x40000 /* 256KB */
|
#define CONFIG_ENV_SIZE 0x40000 /* 256KB */
|
||||||
|
#ifdef CONFIG_TFABOOT
|
||||||
|
#define CONFIG_ENV_OFFSET 0x500000 /* 5MB */
|
||||||
|
#else
|
||||||
#define CONFIG_ENV_OFFSET 0x300000 /* 3MB */
|
#define CONFIG_ENV_OFFSET 0x300000 /* 3MB */
|
||||||
|
#endif
|
||||||
#define CONFIG_ENV_SECT_SIZE 0x40000
|
#define CONFIG_ENV_SECT_SIZE 0x40000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -106,9 +114,15 @@
|
|||||||
"kernel_size=0x2800000\0" \
|
"kernel_size=0x2800000\0" \
|
||||||
|
|
||||||
#undef CONFIG_BOOTCOMMAND
|
#undef CONFIG_BOOTCOMMAND
|
||||||
|
#ifdef CONFIG_TFABOOT
|
||||||
|
#define QSPI_NOR_BOOTCOMMAND "pfe stop; sf probe 0:0; sf read $kernel_load "\
|
||||||
|
"$kernel_start $kernel_size && "\
|
||||||
|
"bootm $kernel_load"
|
||||||
|
#else
|
||||||
#define CONFIG_BOOTCOMMAND "pfe stop; sf probe 0:0; sf read $kernel_load "\
|
#define CONFIG_BOOTCOMMAND "pfe stop; sf probe 0:0; sf read $kernel_load "\
|
||||||
"$kernel_start $kernel_size && "\
|
"$kernel_start $kernel_size && "\
|
||||||
"bootm $kernel_load"
|
"bootm $kernel_load"
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Monitor Command Prompt */
|
/* Monitor Command Prompt */
|
||||||
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
|
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
|
||||||
|
@ -112,8 +112,14 @@
|
|||||||
"bootm $load_addr#$board\0"
|
"bootm $load_addr#$board\0"
|
||||||
|
|
||||||
#undef CONFIG_BOOTCOMMAND
|
#undef CONFIG_BOOTCOMMAND
|
||||||
|
#ifdef CONFIG_TFABOOT
|
||||||
|
#undef QSPI_NOR_BOOTCOMMAND
|
||||||
|
#define QSPI_NOR_BOOTCOMMAND "pfe stop; run distro_bootcmd; run qspi_bootcmd; "\
|
||||||
|
"env exists secureboot && esbc_halt;"
|
||||||
|
#else
|
||||||
#define CONFIG_BOOTCOMMAND "pfe stop; run distro_bootcmd; run qspi_bootcmd; "\
|
#define CONFIG_BOOTCOMMAND "pfe stop; run distro_bootcmd; run qspi_bootcmd; "\
|
||||||
"env exists secureboot && esbc_halt;"
|
"env exists secureboot && esbc_halt;"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <asm/fsl_secure_boot.h>
|
#include <asm/fsl_secure_boot.h>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user