From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [PATCH 24/30] arm: imx: Finish migration of CONFIG_CSF_SIZE to Kconfig
Date: Wed, 10 Jun 2020 16:16:28 -0400 [thread overview]
Message-ID: <20200610201634.8457-25-trini@konsulko.com> (raw)
In-Reply-To: <20200610201634.8457-1-trini@konsulko.com>
While the normal case of CSF_SIZE is handled via Kconfig we have entries
in config headers related to CONFIG_SECURE_BOOT. However in commit
d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with CONFIG_IMX_HAB")
this was renamed to CONFIG_IMX_HAB. Update the CSF_SIZE entry to have
the correct default value if we have IMX_HAB enabled.
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: NXP i.MX U-Boot Team <uboot-imx@nxp.com>
Fixes: d714a75fd4dc ("imx: replace CONFIG_SECURE_BOOT with CONFIG_IMX_HAB")
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/mach-imx/Kconfig | 1 +
include/configs/imx8mm_beacon.h | 4 ----
include/configs/imx8mm_evk.h | 4 ----
include/configs/imx8mn_evk.h | 4 ----
include/configs/imx8mp_evk.h | 4 ----
include/configs/verdin-imx8mm.h | 4 ----
6 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 6c3fedf665d6..0648c2725bf8 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -52,6 +52,7 @@ config IMX_HAB
config CSF_SIZE
hex "Maximum size for Command Sequence File (CSF) binary"
+ default 0x2000 if IMX_HAB
default 0x2060
help
Define the maximum size for Command Sequence File (CSF) binary
diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h
index 21102d3c14d2..ce3ba7492435 100644
--- a/include/configs/imx8mm_beacon.h
+++ b/include/configs/imx8mm_beacon.h
@@ -9,10 +9,6 @@
#include <linux/sizes.h>
#include <asm/arch/imx-regs.h>
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE SZ_8K
-#endif
-
#define CONFIG_SPL_MAX_SIZE (148 * 1024)
#define CONFIG_SYS_MONITOR_LEN SZ_512K
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 901a1bed6dd1..382ba620ccf4 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -10,10 +10,6 @@
#include <linux/stringify.h>
#include <asm/arch/imx-regs.h>
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE SZ_8K
-#endif
-
#define CONFIG_SPL_MAX_SIZE (148 * 1024)
#define CONFIG_SYS_MONITOR_LEN SZ_512K
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
index a07440c73ba8..4350b5a62aff 100644
--- a/include/configs/imx8mn_evk.h
+++ b/include/configs/imx8mn_evk.h
@@ -10,10 +10,6 @@
#include <linux/stringify.h>
#include <asm/arch/imx-regs.h>
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE SZ_8K
-#endif
-
#define CONFIG_SPL_MAX_SIZE (148 * 1024)
#define CONFIG_SYS_MONITOR_LEN SZ_512K
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index 7f38f21c09c5..9c13235982c6 100644
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -10,10 +10,6 @@
#include <linux/stringify.h>
#include <asm/arch/imx-regs.h>
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE 0x2000 /* 8K region */
-#endif
-
#define CONFIG_SPL_MAX_SIZE (152 * 1024)
#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index ca528598f2f1..878c4996df42 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -9,10 +9,6 @@
#include <asm/arch/imx-regs.h>
#include <linux/sizes.h>
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE SZ_8K
-#endif
-
#define CONFIG_SPL_MAX_SIZE (148 * 1024)
#define CONFIG_SYS_MONITOR_LEN SZ_512K
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
--
2.17.1
next prev parent reply other threads:[~2020-06-10 20:16 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-10 20:16 [PATCH 00/30] Finish some Kconfig migrations Tom Rini
2020-06-10 20:16 ` [PATCH 01/30] Convert CONFIG_AM335X_LCD to Kconfig Tom Rini
2020-06-10 20:16 ` [PATCH 02/30] Convert CONFIG_ARCH_MISC_INIT " Tom Rini
2020-06-10 20:16 ` [PATCH 03/30] Convert CONFIG_ARM_PL180_MMCI " Tom Rini
2020-06-10 20:16 ` [PATCH 04/30] Convert CONFIG_ARMV7_PSCI et al " Tom Rini
2020-06-10 20:16 ` [PATCH 05/30] Convert CONFIG_AT91_GPIO " Tom Rini
2020-06-10 20:16 ` [PATCH 06/30] Convert CONFIG_ATMEL_HLCD " Tom Rini
2020-06-10 20:16 ` [PATCH 07/30] Convert CONFIG_ATMEL_NAND_HW_PMECC et al " Tom Rini
2020-06-10 20:16 ` [PATCH 08/30] Convert CONFIG_ATMEL_USART " Tom Rini
2020-06-10 20:16 ` [PATCH 09/30] bk4r1: Re-convert CONFIG_AUTOBOOT_PROMPT et al " Tom Rini
2020-06-10 20:16 ` [PATCH 10/30] Convert CONFIG_BAUDRATE " Tom Rini
2020-06-10 20:16 ` [PATCH 11/30] Convert CONFIG_BOARD_EARLY_INIT_F et al " Tom Rini
2020-06-10 20:16 ` [PATCH 12/30] Convert CONFIG_BOOTARGS " Tom Rini
2020-06-10 20:16 ` [PATCH 13/30] Convert CONFIG_BCH " Tom Rini
2020-06-10 20:16 ` [PATCH 14/30] Convert CONFIG_BOARD_TYPES " Tom Rini
2020-06-10 20:16 ` [PATCH 15/30] arm: capricorn: Convert CONFIG_BOOTCOUNT_ENV et al " Tom Rini
2020-06-10 20:16 ` [PATCH 16/30] arm: abb secu1: Convert CONFIG_BOOTDELAY " Tom Rini
2020-06-12 7:26 ` Holger Brunck
2020-06-10 20:16 ` [PATCH 17/30] Convert CONFIG_BOOTP_DNS2 " Tom Rini
2020-06-10 20:16 ` [PATCH 18/30] Convert CONFIG_BOUNCE_BUFFER " Tom Rini
2020-06-10 20:16 ` [PATCH 19/30] Convert CONFIG_BUILD_TARGET " Tom Rini
2020-06-10 20:16 ` [PATCH 20/30] Convert CONFIG_CMDLINE_EDITING " Tom Rini
2020-06-10 20:16 ` [PATCH 21/30] Convert CONFIG_CONS_INDEX " Tom Rini
2020-06-10 20:16 ` [PATCH 22/30] arm: toradex: Convert CONFIG_CONSOLE_MUX " Tom Rini
2020-06-11 14:35 ` Igor Opaniuk
2020-06-10 20:16 ` [PATCH 23/30] Convert CONFIG_CONSOLE_SCROLL_LINES " Tom Rini
2020-06-10 20:16 ` Tom Rini [this message]
2020-06-11 5:28 ` [EXT] [PATCH 24/30] arm: imx: Finish migration of CONFIG_CSF_SIZE " Ye Li
2020-06-11 12:11 ` Tom Rini
2020-06-11 21:16 ` Tom Rini
2020-06-10 20:16 ` [PATCH 25/30] arm: imx: Finish migration from CONFIG_SECURE_BOOT to CONFIG_IMX_HAB Tom Rini
2020-06-11 19:31 ` Vladimir Oltean
2020-06-11 20:30 ` Tom Rini
2020-06-11 21:02 ` Vladimir Oltean
2020-06-11 21:07 ` Tom Rini
2020-06-10 20:16 ` [PATCH 26/30] Convert CONFIG_BOOTM_NETBSD to Kconfig Tom Rini
2020-06-10 20:16 ` [PATCH 27/30] Kconfig: Remove CONFIG_CLOCKS_IN_MHZ Tom Rini
2020-06-10 20:16 ` [PATCH 28/30] spi: Enable missing CONFIG_SPL_DM_SPI support Tom Rini
2020-06-10 20:38 ` Marek Vasut
2020-06-10 21:01 ` Tom Rini
2020-06-10 21:48 ` Tom Rini
2020-06-10 21:52 ` Marek Vasut
2020-06-10 22:01 ` Tom Rini
2020-06-11 7:28 ` Patrick DELAUNAY
2020-06-11 10:38 ` Adam Ford
2020-06-11 12:17 ` Tom Rini
2020-06-12 2:09 ` Adam Ford
2020-06-12 2:24 ` Adam Ford
2020-06-12 7:59 ` Luca Ceresoli
2020-06-10 20:16 ` [PATCH 29/30] spi: Update build guard for DM objects to cover SPL/TPL Tom Rini
2020-06-10 20:16 ` [PATCH 30/30] Convert CONFIG_CADENCE_QSPI to Kconfig Tom Rini
-- strict thread matches above, loose matches on Subject: below --
2020-06-12 1:55 [PATCH 24/30] arm: imx: Finish migration of CONFIG_CSF_SIZE " Ye Li
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=20200610201634.8457-25-trini@konsulko.com \
--to=trini@konsulko.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox