All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 05/45] arm: fsl: Adjust ordering of #ifndef CONFIG_SPL_BUILD
Date: Mon, 12 Sep 2016 23:18:23 -0600	[thread overview]
Message-ID: <1473743943-15003-6-git-send-email-sjg@chromium.org> (raw)
In-Reply-To: <1473743943-15003-1-git-send-email-sjg@chromium.org>

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>
---

Changes in v3: None
Changes in v2: None

 arch/arm/include/asm/fsl_secure_boot.h     | 2 +-
 arch/powerpc/include/asm/fsl_secure_boot.h | 3 ++-
 2 files changed, 3 insertions(+), 2 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
diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h
index 2e937f0..01255d8 100644
--- a/arch/powerpc/include/asm/fsl_secure_boot.h
+++ b/arch/powerpc/include/asm/fsl_secure_boot.h
@@ -80,12 +80,13 @@
 
 #ifdef CONFIG_CHAIN_OF_TRUST
 
-#ifdef CONFIG_SPL_BUILD
 #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
 /*
  * PPAACT and SPAACT table for PAMU must be placed on DDR after DDR init
  * due to space crunch on CPC and thus malloc will not work.
-- 
2.8.0.rc3.226.g39d4020

  parent reply	other threads:[~2016-09-13  5:18 UTC|newest]

Thread overview: 97+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-13  5:18 [U-Boot] [PATCH v3 00/45] Kconfig: Move CONFIG_SPL_..._SUPPORT to Kconfig Simon Glass
2016-09-13  5:18 ` [U-Boot] [PATCH v3 01/45] Correct defconfigs using savedefconfig Simon Glass
2016-09-18 15:58   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 02/45] moveconfig: Add an option to skip prompts Simon Glass
2016-09-18 15:58   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 03/45] moveconfig: Add an option to commit changes Simon Glass
2016-09-18 15:58   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 04/45] Kconfig: Move SPL settings into their own file Simon Glass
2016-09-18 15:58   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` Simon Glass [this message]
2016-09-18 15:58   ` [U-Boot] [U-Boot, v3, 05/45] arm: fsl: Adjust ordering of #ifndef CONFIG_SPL_BUILD Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 06/45] Drop CONFIG_SPL_RAM_SUPPORT Simon Glass
2016-09-18 15:58   ` [U-Boot] [U-Boot,v3,06/45] " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 07/45] Use separate options for TPL support Simon Glass
2016-09-18 15:58   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 08/45] Kconfig: spl: Add SPL support options to Kconfig Simon Glass
2016-09-13  5:18 ` [U-Boot] [PATCH v3 09/45] Kconfig: tpl: Add some TPL " Simon Glass
2016-09-18 15:58   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 10/45] Move existing use of CONFIG_SPL_DM " Simon Glass
2016-09-18 15:58   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 11/45] Move existing use of CONFIG_SPL_RSA " Simon Glass
2016-09-18 15:58   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 12/45] spear: Use upper case for CONFIG options Simon Glass
2016-09-16 20:38   ` Tom Rini
2016-09-18 15:58   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 13/45] Convert CONFIG_SPL_CRYPTO_SUPPORT to Kconfig Simon Glass
2016-09-18 15:59   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 14/45] Convert CONFIG_SPL_HASH_SUPPORT " Simon Glass
2016-09-18 15:59   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 15/45] Convert CONFIG_SPL_DMA_SUPPORT " Simon Glass
2016-09-18 15:59   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 16/45] Convert CONFIG_SPL_DRIVERS_MISC_SUPPORT " Simon Glass
2016-09-18 15:59   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 17/45] Convert CONFIG_SPL_ENV_SUPPORT " Simon Glass
2016-09-18 15:59   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 18/45] Convert CONFIG_SPL_ETH_SUPPORT " Simon Glass
2016-09-18 15:59   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 19/45] Convert CONFIG_SPL_EXT_SUPPORT " Simon Glass
2016-09-18 15:59   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 20/45] Convert CONFIG_SPL_FAT_SUPPORT " Simon Glass
2016-09-18 15:59   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 21/45] Convert CONFIG_SPL_GPIO_SUPPORT " Simon Glass
2016-09-18 15:59   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 22/45] Convert CONFIG_SPL_I2C_SUPPORT " Simon Glass
2016-09-18 15:59   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 23/45] Convert CONFIG_SPL_LIBCOMMON_SUPPORT " Simon Glass
2016-09-18 15:59   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 24/45] Convert CONFIG_SPL_LIBDISK_SUPPORT " Simon Glass
2016-09-18 15:59   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 25/45] Convert CONFIG_SPL_LIBGENERIC_SUPPORT " Simon Glass
2016-09-18 15:59   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 26/45] Convert CONFIG_SPL_MMC_SUPPORT " Simon Glass
2016-09-18 15:59   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 27/45] Convert CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT " Simon Glass
2016-09-18 16:00   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 28/45] Convert CONFIG_SPL_MTD_SUPPORT " Simon Glass
2016-09-18 16:00   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 29/45] Convert CONFIG_SPL_MUSB_NEW_SUPPORT " Simon Glass
2016-09-18 16:00   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 30/45] Convert CONFIG_SPL_NAND_SUPPORT " Simon Glass
2016-09-18 16:00   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 31/45] Convert CONFIG_SPL_NET_VCI_STRING " Simon Glass
2016-09-18 16:00   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 32/45] Convert CONFIG_SPL_NET_SUPPORT " Simon Glass
2016-09-18 16:00   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 33/45] Convert CONFIG_SPL_NOR_SUPPORT " Simon Glass
2016-09-18 16:00   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 34/45] Convert CONFIG_SPL_ONENAND_SUPPORT " Simon Glass
2016-09-18 16:00   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 35/45] Remove CONFIG_SPL_PINCTRL_SUPPORT Simon Glass
2016-09-13  5:28   ` Masahiro Yamada
2016-09-13 13:09     ` Simon Glass
2016-09-13  5:18 ` [U-Boot] [PATCH v3 36/45] Convert CONFIG_SPL_POWER_SUPPORT to Kconfig Simon Glass
2016-09-18 16:00   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 37/45] Convert CONFIG_SPL_SATA_SUPPORT " Simon Glass
2016-09-18 16:00   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 38/45] Convert CONFIG_SPL_SERIAL_SUPPORT " Simon Glass
2016-09-18 16:00   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 39/45] Convert CONFIG_SPL_SPI_FLASH_SUPPORT " Simon Glass
2016-09-18 16:00   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 40/45] Convert CONFIG_SPL_SPI_SUPPORT " Simon Glass
2016-09-18 16:00   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:18 ` [U-Boot] [PATCH v3 41/45] Convert CONFIG_SPL_USBETH_SUPPORT " Simon Glass
2016-09-18 16:01   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:19 ` [U-Boot] [PATCH v3 42/45] Convert CONFIG_SPL_USB_HOST_SUPPORT " Simon Glass
2016-09-18 16:01   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:19 ` [U-Boot] [PATCH v3 43/45] Convert CONFIG_SPL_USB_SUPPORT " Simon Glass
2016-09-18 16:01   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:19 ` [U-Boot] [PATCH v3 44/45] Convert CONFIG_SPL_WATCHDOG_SUPPORT " Simon Glass
2016-09-18 16:01   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  5:19 ` [U-Boot] [PATCH v3 45/45] Convert CONFIG_SPL_YMODEM_SUPPORT " Simon Glass
2016-09-18 16:01   ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-09-13  6:02 ` [U-Boot] [PATCH v3 00/45] Kconfig: Move CONFIG_SPL_..._SUPPORT " Heiko Schocher
2016-09-13 13:08   ` Simon Glass
2016-09-14  5:59     ` Heiko Schocher
2016-09-18 15:58 ` Tom Rini
2016-09-19  0:56   ` Simon Glass

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=1473743943-15003-6-git-send-email-sjg@chromium.org \
    --to=sjg@chromium.org \
    --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.