[U-Boot] [PATCH] armv8: ls1046aqds: added ppa support
PPA is used on ls1046aqds to support sleep, hotplug feature. Add PPA support to enable them.
Signed-off-by: Tang Yuantian andy.tang@nxp.com --- board/freescale/ls1046aqds/ls1046aqds.c | 5 +++++ include/configs/ls1046aqds.h | 11 +++++++++++ 2 files changed, 16 insertions(+)
diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c index af3f70a..470e61a 100644 --- a/board/freescale/ls1046aqds/ls1046aqds.c +++ b/board/freescale/ls1046aqds/ls1046aqds.c @@ -22,6 +22,7 @@ #include <fsl_esdhc.h> #include <fsl_ifc.h> #include <spl.h> +#include <asm/arch/ppa.h>
#include "../common/vid.h" #include "../common/qixis.h" @@ -265,6 +266,10 @@ int board_init(void) if (adjust_vdd(0)) printf("Warning: Adjusting core voltage failed.\n");
+#ifdef CONFIG_FSL_LS_PPA + ppa_init(); +#endif + return 0; }
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 4b3b21e..f8f74aa 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -9,6 +9,17 @@
#include "ls1046a_common.h"
+#if defined(CONFIG_FSL_LS_PPA) +#define CONFIG_ARMV8_PSCI +#define CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT +#define SEC_FIRMWARE_ERET_ADDR_REVERT + +#define CONFIG_SYS_LS_PPA_FW_IN_XIP +#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP +#define CONFIG_SYS_LS_PPA_FW_ADDR 0x60500000 +#endif +#endif + #if defined(CONFIG_NAND_BOOT) || defined(CONFIG_SD_BOOT) #define CONFIG_SYS_TEXT_BASE 0x82000000 #elif defined(CONFIG_QSPI_BOOT)
Signed-off-by: Tang Yuantian andy.tang@nxp.com --- configs/ls1046aqds_defconfig | 1 + configs/ls1046aqds_lpuart_defconfig | 1 + configs/ls1046aqds_nand_defconfig | 1 + configs/ls1046aqds_qspi_defconfig | 1 + configs/ls1046aqds_sdcard_ifc_defconfig | 1 + configs/ls1046aqds_sdcard_qspi_defconfig | 1 + 6 files changed, 6 insertions(+)
diff --git a/configs/ls1046aqds_defconfig b/configs/ls1046aqds_defconfig index d6b8af2..cb0f164 100644 --- a/configs/ls1046aqds_defconfig +++ b/configs/ls1046aqds_defconfig @@ -35,3 +35,4 @@ CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_FSL_LS_PPA=y diff --git a/configs/ls1046aqds_lpuart_defconfig b/configs/ls1046aqds_lpuart_defconfig index 20136a4..b481d90 100644 --- a/configs/ls1046aqds_lpuart_defconfig +++ b/configs/ls1046aqds_lpuart_defconfig @@ -31,3 +31,4 @@ CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_FSL_LS_PPA=y diff --git a/configs/ls1046aqds_nand_defconfig b/configs/ls1046aqds_nand_defconfig index b23861c..c4e9c90 100644 --- a/configs/ls1046aqds_nand_defconfig +++ b/configs/ls1046aqds_nand_defconfig @@ -40,3 +40,4 @@ CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_FSL_LS_PPA=y diff --git a/configs/ls1046aqds_qspi_defconfig b/configs/ls1046aqds_qspi_defconfig index 45782be..0bbee81 100644 --- a/configs/ls1046aqds_qspi_defconfig +++ b/configs/ls1046aqds_qspi_defconfig @@ -37,3 +37,4 @@ CONFIG_FSL_DSPI=y CONFIG_FSL_QSPI=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_FSL_LS_PPA=y diff --git a/configs/ls1046aqds_sdcard_ifc_defconfig b/configs/ls1046aqds_sdcard_ifc_defconfig index 3df92b2..c5ff822 100644 --- a/configs/ls1046aqds_sdcard_ifc_defconfig +++ b/configs/ls1046aqds_sdcard_ifc_defconfig @@ -41,3 +41,4 @@ CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_FSL_LS_PPA=y diff --git a/configs/ls1046aqds_sdcard_qspi_defconfig b/configs/ls1046aqds_sdcard_qspi_defconfig index 998d2cf..34950ee 100644 --- a/configs/ls1046aqds_sdcard_qspi_defconfig +++ b/configs/ls1046aqds_sdcard_qspi_defconfig @@ -42,3 +42,4 @@ CONFIG_FSL_DSPI=y CONFIG_FSL_QSPI=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_FSL_LS_PPA=y
On 03/09/2017 11:03 PM, Yuantian Tang wrote:
Signed-off-by: Tang Yuantian andy.tang@nxp.com
configs/ls1046aqds_defconfig | 1 + configs/ls1046aqds_lpuart_defconfig | 1 + configs/ls1046aqds_nand_defconfig | 1 + configs/ls1046aqds_qspi_defconfig | 1 + configs/ls1046aqds_sdcard_ifc_defconfig | 1 + configs/ls1046aqds_sdcard_qspi_defconfig | 1 + 6 files changed, 6 insertions(+)
Applied to u-boot-fsl-qoriq master, awaiting upstream. Thanks. Please note, even this patch is applied, PPA for LS1046AQDS is not loaded until you add the support in board file. Please update your first patch in this set.
York
Hi York,
Thanks for you reminder. Hou Ziqiang will continue to submit ppa patch for LS1046AQDS which will replace mine.
Regards, Andy
-----Original Message----- From: York Sun [mailto:york.sun@nxp.com] Sent: Tuesday, April 18, 2017 11:46 PM To: Andy Tang andy.tang@nxp.com Cc: u-boot@lists.denx.de Subject: Re: [PATCH 2/2] armv8: ls1046aqds: enable ppa in default config
On 03/09/2017 11:03 PM, Yuantian Tang wrote:
Signed-off-by: Tang Yuantian andy.tang@nxp.com
configs/ls1046aqds_defconfig | 1 + configs/ls1046aqds_lpuart_defconfig | 1 + configs/ls1046aqds_nand_defconfig | 1 + configs/ls1046aqds_qspi_defconfig | 1 + configs/ls1046aqds_sdcard_ifc_defconfig | 1 + configs/ls1046aqds_sdcard_qspi_defconfig | 1 + 6 files changed, 6 insertions(+)
Applied to u-boot-fsl-qoriq master, awaiting upstream. Thanks. Please note, even this patch is applied, PPA for LS1046AQDS is not loaded until you add the support in board file. Please update your first patch in this set.
York
On 03/09/2017 11:03 PM, Yuantian Tang wrote:
PPA is used on ls1046aqds to support sleep, hotplug feature. Add PPA support to enable them.
Signed-off-by: Tang Yuantian andy.tang@nxp.com
board/freescale/ls1046aqds/ls1046aqds.c | 5 +++++ include/configs/ls1046aqds.h | 11 +++++++++++ 2 files changed, 16 insertions(+)
<snip>
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 4b3b21e..f8f74aa 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -9,6 +9,17 @@
#include "ls1046a_common.h"
+#if defined(CONFIG_FSL_LS_PPA) +#define CONFIG_ARMV8_PSCI +#define CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT +#define SEC_FIRMWARE_ERET_ADDR_REVERT
+#define CONFIG_SYS_LS_PPA_FW_IN_XIP +#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP +#define CONFIG_SYS_LS_PPA_FW_ADDR 0x60500000 +#endif +#endif
#if defined(CONFIG_NAND_BOOT) || defined(CONFIG_SD_BOOT) #define CONFIG_SYS_TEXT_BASE 0x82000000 #elif defined(CONFIG_QSPI_BOOT)
This is wrong! Please use Kconfig. The options are already there. You cannot select CONFIG_ARMV8_PSCI with PPA. Please consult Zhiqiang Hou if you have questions.
York
participants (4)
-
Andy Tang -
York Sun -
york sun
-
Yuantian Tang