All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rajesh Bhagat <rajesh.bhagat@nxp.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v6 26/27] armv8: ls1012aqds: Add TFABOOT support
Date: Mon, 5 Nov 2018 18:03:04 +0000	[thread overview]
Message-ID: <20181105181931.7348-27-rajesh.bhagat@nxp.com> (raw)
In-Reply-To: <20181105181931.7348-1-rajesh.bhagat@nxp.com>

TFABOOT support includes:
 - ls1012aqds_tfa_defconfig to be loaded by trusted firmware
 - environment address and size changes for TFABOOT
 - define BOOTCOMMAND for TFABOOT

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>
---
Change in v6:                                                                   
 - Rebased to master 

Change in v5: None

Change in v4: None
                                                                  
Change in v3:                                                                   
 - Added ls1012aqds_tfa_SECURE_BOOT_defconfig                                   
                                                                                
Change in v2:                                                                   
 - Merged ls1012aqds TFA boot support patches                                   
 - Removed extra CONFIG_TFABOOT flag usage  

 board/freescale/ls1012aqds/MAINTAINERS       |  2 +
 board/freescale/ls1012aqds/ls1012aqds.c      | 17 ++++-
 configs/ls1012aqds_tfa_SECURE_BOOT_defconfig | 65 ++++++++++++++++++++
 configs/ls1012aqds_tfa_defconfig             | 63 +++++++++++++++++++
 4 files changed, 144 insertions(+), 3 deletions(-)
 create mode 100644 configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
 create mode 100644 configs/ls1012aqds_tfa_defconfig

diff --git a/board/freescale/ls1012aqds/MAINTAINERS b/board/freescale/ls1012aqds/MAINTAINERS
index 27c4affd30..2dcc22a485 100644
--- a/board/freescale/ls1012aqds/MAINTAINERS
+++ b/board/freescale/ls1012aqds/MAINTAINERS
@@ -1,6 +1,8 @@
 LS1012AQDS BOARD
 M:	Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
+M:	Rajesh Bhagat <rajesh.bhagat@nxp.com>
 S:	Maintained
 F:	board/freescale/ls1012aqds/
 F:	include/configs/ls1012aqds.h
 F:	configs/ls1012aqds_qspi_defconfig
+F:	configs/ls1012aqds_tfa_defconfig
diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c
index 3a1c2351c4..a862fe6a93 100644
--- a/board/freescale/ls1012aqds/ls1012aqds.c
+++ b/board/freescale/ls1012aqds/ls1012aqds.c
@@ -57,6 +57,16 @@ int checkboard(void)
 	return 0;
 }
 
+#ifdef CONFIG_TFABOOT
+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)
 {
 	static const struct fsl_mmdc_info mparam = {
@@ -76,7 +86,6 @@ int dram_init(void)
 	};
 
 	mmdc_init(&mparam);
-
 	gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
 #if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)
 	/* This will break-before-make MMU for DDR */
@@ -85,6 +94,7 @@ int dram_init(void)
 
 	return 0;
 }
+#endif
 
 int board_early_init_f(void)
 {
@@ -112,8 +122,9 @@ int board_init(void)
 
 	/* Set CCI-400 control override register to enable barrier
 	 * 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
 	erratum_a010315();
diff --git a/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
new file mode 100644
index 0000000000..b4423cb2ed
--- /dev/null
+++ b/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
@@ -0,0 +1,65 @@
+CONFIG_ARM=y
+CONFIG_TARGET_LS1012AQDS=y
+CONFIG_SECURE_BOOT=y
+CONFIG_SYS_TEXT_BASE=0x82000000
+CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
+CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
+CONFIG_QSPI_AHB_INIT=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_MISC_INIT_R=y
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_CMD_GREPENV=y
+CONFIG_CMD_EEPROM=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_CMD_DATE=y
+CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-qds"
+CONFIG_ENV_IS_NOWHERE=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_DM=y
+CONFIG_SCSI_AHCI=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_SCSI=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
diff --git a/configs/ls1012aqds_tfa_defconfig b/configs/ls1012aqds_tfa_defconfig
new file mode 100644
index 0000000000..78a447922f
--- /dev/null
+++ b/configs/ls1012aqds_tfa_defconfig
@@ -0,0 +1,63 @@
+CONFIG_ARM=y
+CONFIG_TARGET_LS1012AQDS=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_USE_BOOTCOMMAND is not set
+CONFIG_MISC_INIT_R=y
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_CMD_GREPENV=y
+CONFIG_CMD_EEPROM=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_CMD_DATE=y
+CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-qds"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_DM=y
+CONFIG_SCSI_AHCI=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_SCSI=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
-- 
2.17.1

  parent reply	other threads:[~2018-11-05 18:03 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-05 18:01 [U-Boot] [PATCH v6 00/27] TF-A Boot support for NXP Chassis 2 platforms Rajesh Bhagat
2018-11-05 18:01 ` [U-Boot] [PATCH v6 01/27] move data structure out of cpu.h Rajesh Bhagat
2018-11-05 18:01 ` [U-Boot] [PATCH v6 02/27] env: allow flash and nand env driver to compile together Rajesh Bhagat
2018-12-03 18:14   ` York Sun
2018-11-05 18:01 ` [U-Boot] [PATCH v6 03/27] env: sf: define API to override sf environment address Rajesh Bhagat
2018-12-03 18:16   ` York Sun
2018-11-05 18:01 ` [U-Boot] [PATCH v6 04/27] driver/ifc: replace __ilog2 with LOG2 macro Rajesh Bhagat
2018-11-05 18:01 ` [U-Boot] [PATCH v6 05/27] armv8: layerscape: Enable routing SError exception Rajesh Bhagat
2018-11-05 18:01 ` [U-Boot] [PATCH v6 06/27] armv8: fsl-layerscape: change tlb base from OCRAM to DDR in EL < 3 Rajesh Bhagat
2018-11-05 18:01 ` [U-Boot] [PATCH v6 07/27] drivers: ifc: dynamic chipselect mapping support Rajesh Bhagat
2018-11-05 18:01 ` [U-Boot] [PATCH v6 08/27] armv8: layerscape: Add TFABOOT support Rajesh Bhagat
2018-11-05 18:01 ` [U-Boot] [PATCH v6 09/27] armv8: fsl-layerscape: identify boot source from PORSR register Rajesh Bhagat
2018-11-05 18:01 ` [U-Boot] [PATCH v6 10/27] armv8: layerscape: remove EL3 specific erratas for TFABOOT Rajesh Bhagat
2018-11-05 18:01 ` [U-Boot] [PATCH v6 11/27] armv8: fsl-layerscape: bootcmd identification " Rajesh Bhagat
2018-11-05 18:01 ` [U-Boot] [PATCH v6 12/27] armv8: layerscape: add SMC calls for DDR size and bank info Rajesh Bhagat
2018-11-05 18:02 ` [U-Boot] [PATCH v6 13/27] armv8: layerscape: skip OCRAM init for TFABOOT Rajesh Bhagat
2018-11-05 18:02 ` [U-Boot] [PATCH v6 14/27] armv8: fsl-layerscape: Update parsing boot source Rajesh Bhagat
2018-11-05 18:02 ` [U-Boot] [PATCH v6 15/27] armv8: sec_firmware: change el2_to_aarch32 SMC ID Rajesh Bhagat
2018-11-05 18:02 ` [U-Boot] [PATCH v6 16/27] armv8: sec_firmware: return job ring status as true in TFABOOT Rajesh Bhagat
2018-11-05 18:02 ` [U-Boot] [PATCH v6 17/27] net: fm: add TFABOOT support Rajesh Bhagat
2018-11-05 18:02 ` [U-Boot] [PATCH v6 18/27] drivers: qe: " Rajesh Bhagat
2018-11-05 18:02 ` [U-Boot] [PATCH v6 19/27] armv8: fsl-layerscape: add support of MC framework for TFA Rajesh Bhagat
2018-11-05 18:02 ` [U-Boot] [PATCH v6 20/27] armv8: ls1046ardb: Add TFABOOT support Rajesh Bhagat
2018-11-05 18:02 ` [U-Boot] [PATCH v6 21/27] armv8: ls1046aqds: " Rajesh Bhagat
2018-11-05 18:02 ` [U-Boot] [PATCH v6 22/27] armv8: ls1043ardb: " Rajesh Bhagat
2018-11-05 18:02 ` [U-Boot] [PATCH v6 23/27] armv8: ls1043aqds: " Rajesh Bhagat
2018-11-05 18:02 ` [U-Boot] [PATCH v6 24/27] armv8: ls1012ardb: " Rajesh Bhagat
2018-11-05 18:02 ` [U-Boot] [PATCH v6 25/27] armv8: ls1012aqds: fix secure boot compilation Rajesh Bhagat
2018-11-05 18:03 ` Rajesh Bhagat [this message]
2018-11-05 18:03 ` [U-Boot] [PATCH v6 27/27] armv8: ls1012afrx: Add TFABOOT support Rajesh Bhagat
2018-11-19 20:13 ` [U-Boot] [PATCH v6 00/27] TF-A Boot support for NXP Chassis 2 platforms York Sun
2018-12-10 21:05 ` York Sun

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181105181931.7348-27-rajesh.bhagat@nxp.com \
    --to=rajesh.bhagat@nxp.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.