On 01/16/2017 01:45 AM, Zhiqiang Hou wrote: > From: Hou Zhiqiang <zhiqiang....@nxp.com> > > Signed-off-by: Hou Zhiqiang <zhiqiang....@nxp.com> > --- > V2: > - Generate the patch base on the latest code. > > arch/arm/cpu/armv8/Kconfig | 33 +++++++++++++++++++++++++++++++++ > arch/arm/cpu/armv8/Makefile | 2 +- > arch/arm/cpu/armv8/sec_firmware_asm.S | 4 ++-- > include/configs/ls1043ardb.h | 3 --- > include/configs/ls1046ardb.h | 4 ---- > 5 files changed, 36 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig > index 22dce88..2ee5782 100644 > --- a/arch/arm/cpu/armv8/Kconfig > +++ b/arch/arm/cpu/armv8/Kconfig > @@ -21,6 +21,39 @@ config ARMV8_SPIN_TABLE > - Reserve the code for the spin-table and the release address > via a /memreserve/ region in the Device Tree. > > +menu "ARMv8 secure monitor firmware" > +config ARMV8_SEC_FIRMWARE_SUPPORT > + bool "Enable ARMv8 secure monitor firmware framework support" > + select OF_LIBFDT > + select FIT > + help > + This framework is aimed at making secure monitor firmware load > + process brief. > + Note: Only FIT format image is supported. > + You should prepare and provide the below information: > + - Address of secure firmware. > + - Address to hold the return address from secure firmware. > + - Secure firmware FIT image related information. > + Such as: SEC_FIRMWARE_FIT_IMAGE and SEC_FIRMEWARE_FIT_CNF_NAME > + - The target exception level that secure monitor firmware will > + return to. > + > +config SPL_ARMV8_SEC_FIRMWARE_SUPPORT > + bool "Enable ARMv8 secure monitor firmware framework support for SPL" > + select SPL_OF_LIBFDT > + select SPL_FIT > + help > + Say Y here to support this framework in SPL phase. > + > +config ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT > + bool "ARMv8 secure monitor firmware ERET address byteorder swap" > + depends on ARMV8_SEC_FIRMWARE_SUPPORT || SPL_ARMV8_SEC_FIRMWARE_SUPPORT > + help > + Say Y here when the endianness of the register or memory holding the > + Secure firmware exception return address is different with core's. > + > +endmenu > +
Zhiqiang, After you move the macro to Kconfig, you should remove it from scripts/config_whitelist.txt. Please help me understand when and where ARMV8_SEC_FIRMWARE_SUPPORT is turned on? I am trying to resolve the conflict between this set and Prabhakar's patch for LS1012A PPA http://patchwork.ozlabs.org/patch/709650/. York _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
