summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-09-12 23:18:23 -0600
committerTom Rini <trini@konsulko.com>2016-09-16 17:03:37 -0400
commitb63f8a4336a691964529d9cdc38ad32f716b3fa7 (patch)
tree40e2b52017384c990ebffb0b6f9482547bd8d583 /arch/arm
parentc2ae7d822086fd07386c3a67f76350e749418f66 (diff)
downloadu-boot-imx-b63f8a4336a691964529d9cdc38ad32f716b3fa7.zip
u-boot-imx-b63f8a4336a691964529d9cdc38ad32f716b3fa7.tar.gz
u-boot-imx-b63f8a4336a691964529d9cdc38ad32f716b3fa7.tar.bz2
arm: fsl: Adjust ordering of #ifndef CONFIG_SPL_BUILD
The secure boot header files incorrectly define SPL options only if CONFIG_SPL_BUILD is defined. This means that the options are only enabled in an SPL build, and not with a normal 'make xxx_defconfig'. This means that moveconfig.py cannot work, since it sees the options as disabled even when they may be manually enabled in an SPL build. Fix this by changing the order. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/fsl_secure_boot.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h
index b35c271..1d379c7 100644
--- a/arch/arm/include/asm/fsl_secure_boot.h
+++ b/arch/arm/include/asm/fsl_secure_boot.h
@@ -26,13 +26,13 @@
#define CONFIG_FSL_CAAM
#endif
-#ifdef CONFIG_SPL_BUILD
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_DM 1
#define CONFIG_SPL_CRYPTO_SUPPORT
#define CONFIG_SPL_HASH_SUPPORT
#define CONFIG_SPL_RSA
#define CONFIG_SPL_DRIVERS_MISC_SUPPORT
+#ifdef CONFIG_SPL_BUILD
/*
* Define 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