X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=arch%2FKconfig.nxp;h=5971ec5df4e6ecef371879529429d5f58d8e6a02;hb=3dc2987f5c9b79e19ea6b0e69e01a817310abaac;hp=22ae186b358def93d935437bc2afad6002151330;hpb=601483ffd544f98023062949670e2aa048d31cc7;p=platform%2Fkernel%2Fu-boot.git

diff --git a/arch/Kconfig.nxp b/arch/Kconfig.nxp
index 22ae186..5971ec5 100644
--- a/arch/Kconfig.nxp
+++ b/arch/Kconfig.nxp
@@ -1,7 +1,13 @@
-config CHAIN_OF_TRUST
+config NXP_ESBC
+	bool "NXP ESBC (secure boot) functionality"
+	help
+	  Enable Freescale Secure Boot feature. Normally selected by defconfig.
+	  If unsure, do not change.
+
+menu "Chain of trust / secure boot options"
 	depends on !FIT_SIGNATURE && NXP_ESBC
-	imply CMD_BLOB
-	imply CMD_HASH if ARM
+
+config CHAIN_OF_TRUST
 	select FSL_CAAM
 	select ARCH_MISC_INIT
 	select FSL_SEC_MON
@@ -12,12 +18,12 @@ config CHAIN_OF_TRUST
 	select ENV_IS_NOWHERE
 	select CMD_EXT4 if ARM
 	select CMD_EXT4_WRITE if ARM
-	bool
-	default y
+	imply CMD_BLOB
+	imply CMD_HASH if ARM
+	def_bool y
 
 config CMD_ESBC_VALIDATE
 	bool "Enable the 'esbc_validate' and 'esbc_halt' commands"
-	depends on CHAIN_OF_TRUST
 	default y
 	help
 	  This option enables two commands used for secure booting:
@@ -36,15 +42,14 @@ config ESBC_ADDR_64BIT
 
 config SYS_FSL_SFP_BE
 	def_bool y
-	depends on CHAIN_OF_TRUST && (PPC || FSL_LSCH2 || ARCH_LS1021A)
+	depends on PPC || FSL_LSCH2 || ARCH_LS1021A
 
 config SYS_FSL_SFP_LE
 	def_bool y
-	depends on CHAIN_OF_TRUST && !SYS_FSL_SFP_BE
+	depends on !SYS_FSL_SFP_BE
 
 choice
 	prompt "SFP IP revision"
-	depends on CHAIN_OF_TRUST
 	default SYS_FSL_SFP_VER_3_0 if PPC
 	default SYS_FSL_SFP_VER_3_4
 
@@ -59,13 +64,67 @@ config SYS_FSL_SFP_VER_3_4
 
 endchoice
 
+config SPL_UBOOT_KEY_HASH
+	string "Non-SRK key hash for U-Boot public/private key pair"
+	depends on SPL
+	default ""
+	help
+	  Set the key hash for U-Boot here if public/private key pair used to
+	  sign U-boot are different from the SRK hash put in the fuse.  Example
+	  of a key hash is
+	  41066b564c6ffcef40ccbc1e0a5d0d519604000c785d97bbefd25e4d288d1c8b.
+	  Otherwise leave this empty.
+
+if PPC
+
+config BOOTSCRIPT_COPY_RAM
+	bool "Secure boot copies boot script to RAM"
+	help
+	  On systems that support chain of trust booting, a number of addresses
+	  are required to set variables that are used in the copying and then
+	  verification of different parts of the system.  If enabled, the subsequent
+	  options are for what location to use in each step.
+
+config BS_ADDR_DEVICE
+	hex "Address in RAM for bs_device"
+	depends on BOOTSCRIPT_COPY_RAM
+
+config BS_SIZE
+	hex "The size of bs_size which is the amount read from bs_device"
+	depends on BOOTSCRIPT_COPY_RAM
+
+config BS_ADDR_RAM
+	hex "Address in RAM for bs_ram"
+	depends on BOOTSCRIPT_COPY_RAM
+
+config BS_HDR_ADDR_DEVICE
+	hex "Address in RAM for bs_hdr_device"
+	depends on BOOTSCRIPT_COPY_RAM
+
+config BS_HDR_SIZE
+	hex "The size of bs_hdr_size which is the amount read from bs_hdr_device"
+	depends on BOOTSCRIPT_COPY_RAM
+
+config BS_HDR_ADDR_RAM
+	hex "Address in RAM for bs_hdr_ram"
+	depends on BOOTSCRIPT_COPY_RAM
+
+config BOOTSCRIPT_HDR_ADDR
+	hex "CONFIG_BOOTSCRIPT_HDR_ADDR"
+	default BS_ADDR_RAM if BOOTSCRIPT_COPY_RAM
+
+endif
+
 config SYS_FSL_SRK_LE
 	def_bool y
-	depends on CHAIN_OF_TRUST && ARM
+	depends on ARM
 
 config KEY_REVOCATION
 	def_bool y
-	depends on CHAIN_OF_TRUST
+
+endmenu
+
+comment "Other functionality shared between NXP SoCs"
 
 config DEEP_SLEEP
 	bool "Enable SoC deep sleep feature"
@@ -75,6 +134,26 @@ config DEEP_SLEEP
 	  Indicates this SoC supports deep sleep feature. If deep sleep is
 	  supported, core will start to execute uboot when wakes up.
 
+config LAYERSCAPE_NS_ACCESS
+	bool "Layerscape non-secure access support"
+	depends on ARCH_LS1021A || FSL_LSCH2
+
+config PCIE1
+	bool "PCIe controller #1"
+	depends on LAYERSCAPE_NS_ACCESS || PPC
+
+config PCIE2
+	bool "PCIe controller #2"
+	depends on LAYERSCAPE_NS_ACCESS || PPC
+
+config PCIE3
+	bool "PCIe controller #3"
+	depends on LAYERSCAPE_NS_ACCESS || PPC
+
+config PCIE4
+	bool "PCIe controller #4"
+	depends on LAYERSCAPE_NS_ACCESS || PPC
+
 config FSL_USE_PCA9547_MUX
 	bool "Enable PCA9547 I2C Mux on Freescale boards"
 	depends on PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3