From: Tero Kristo <kristo@kernel.org>
To: lokeshvutla@ti.com, trini@konsulko.com, u-boot@lists.denx.de
Subject: [PATCHv6 04/26] common: fit: Update board_fit_image_post_process() to pass fit and node_offset
Date: Fri, 11 Jun 2021 11:45:05 +0300 [thread overview]
Message-ID: <20210611084527.7048-5-kristo@kernel.org> (raw)
In-Reply-To: <20210611084527.7048-1-kristo@kernel.org>
From: Lokesh Vutla <lokeshvutla@ti.com>
board_fit_image_post_process() passes only start and size of the image,
but type of the image is not passed. So pass fit and node_offset, to
derive information about image to be processed.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Tero Kristo <kristo@kernel.org>
---
arch/arm/mach-k3/security.c | 3 ++-
arch/arm/mach-keystone/mon.c | 3 ++-
arch/arm/mach-socfpga/board.c | 3 ++-
board/ti/am335x/board.c | 3 ++-
board/ti/am43xx/board.c | 3 ++-
board/ti/am57xx/board.c | 3 ++-
board/ti/dra7xx/evm.c | 3 ++-
common/image-fit.c | 2 +-
common/spl/spl_fit.c | 2 +-
include/image.h | 5 ++++-
10 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/arch/arm/mach-k3/security.c b/arch/arm/mach-k3/security.c
index 66f90a5a34..5b5ff9ba7b 100644
--- a/arch/arm/mach-k3/security.c
+++ b/arch/arm/mach-k3/security.c
@@ -18,7 +18,8 @@
#include <spl.h>
#include <asm/arch/sys_proto.h>
-void board_fit_image_post_process(void **p_image, size_t *p_size)
+void board_fit_image_post_process(const void *fit, int node, void **p_image,
+ size_t *p_size)
{
struct ti_sci_handle *ti_sci = get_ti_sci_handle();
struct ti_sci_proc_ops *proc_ops = &ti_sci->ops.proc_ops;
diff --git a/arch/arm/mach-keystone/mon.c b/arch/arm/mach-keystone/mon.c
index 58995d73ac..b863bab196 100644
--- a/arch/arm/mach-keystone/mon.c
+++ b/arch/arm/mach-keystone/mon.c
@@ -103,7 +103,8 @@ static int k2_hs_bm_auth(int cmd, void *arg1)
return result;
}
-void board_fit_image_post_process(void **p_image, size_t *p_size)
+void board_fit_image_post_process(const void *fit, int node, void **p_image,
+ size_t *p_size)
{
int result = 0;
void *image = *p_image;
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c
index 650122fcd4..36eecdc057 100644
--- a/arch/arm/mach-socfpga/board.c
+++ b/arch/arm/mach-socfpga/board.c
@@ -103,7 +103,8 @@ __weak int board_fit_config_name_match(const char *name)
#endif
#if IS_ENABLED(CONFIG_FIT_IMAGE_POST_PROCESS)
-void board_fit_image_post_process(void **p_image, size_t *p_size)
+void board_fit_image_post_process(const void *fit, int node, void **p_image,
+ size_t *p_size)
{
if (IS_ENABLED(CONFIG_SOCFPGA_SECURE_VAB_AUTH)) {
if (socfpga_vendor_authentication(p_image, p_size))
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 5959ff73dc..5c156a5d1d 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -960,7 +960,8 @@ int board_fit_config_name_match(const char *name)
#endif
#ifdef CONFIG_TI_SECURE_DEVICE
-void board_fit_image_post_process(void **p_image, size_t *p_size)
+void board_fit_image_post_process(const void *fit, int node, void **p_image,
+ size_t *p_size)
{
secure_boot_verify_image(p_image, p_size);
}
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index e9febb9592..a71b588efc 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -896,7 +896,8 @@ int embedded_dtb_select(void)
#endif
#ifdef CONFIG_TI_SECURE_DEVICE
-void board_fit_image_post_process(void **p_image, size_t *p_size)
+void board_fit_image_post_process(const void *fit, int node, void **p_image,
+ size_t *p_size)
{
secure_boot_verify_image(p_image, p_size);
}
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 05c26c74d9..399a2e5d91 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -1199,7 +1199,8 @@ static int board_bootmode_has_emmc(void)
#endif
#ifdef CONFIG_TI_SECURE_DEVICE
-void board_fit_image_post_process(void **p_image, size_t *p_size)
+void board_fit_image_post_process(const void *fit, int node, void **p_image,
+ size_t *p_size)
{
secure_boot_verify_image(p_image, p_size);
}
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index 05f251f778..23e8005991 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -1065,7 +1065,8 @@ int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
#endif
#ifdef CONFIG_TI_SECURE_DEVICE
-void board_fit_image_post_process(void **p_image, size_t *p_size)
+void board_fit_image_post_process(const void *fit, int node, void **p_image,
+ size_t *p_size)
{
secure_boot_verify_image(p_image, p_size);
}
diff --git a/common/image-fit.c b/common/image-fit.c
index e614643fe3..0c5a05948d 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -2143,7 +2143,7 @@ int fit_image_load(bootm_headers_t *images, ulong addr,
/* perform any post-processing on the image data */
if (!host_build() && IS_ENABLED(CONFIG_FIT_IMAGE_POST_PROCESS))
- board_fit_image_post_process(&buf, &size);
+ board_fit_image_post_process(fit, noffset, &buf, &size);
len = (ulong)size;
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index caddf51196..57d621d5b3 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -320,7 +320,7 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
}
if (CONFIG_IS_ENABLED(FIT_IMAGE_POST_PROCESS))
- board_fit_image_post_process(&src, &length);
+ board_fit_image_post_process(fit, node, &src, &length);
load_ptr = map_sysmem(load_addr, length);
if (IS_ENABLED(CONFIG_SPL_GZIP) && image_comp == IH_COMP_GZIP) {
diff --git a/include/image.h b/include/image.h
index 459685d4d4..0c24bf6f35 100644
--- a/include/image.h
+++ b/include/image.h
@@ -1581,11 +1581,14 @@ int board_fit_config_name_match(const char *name);
* into the FIT creation (i.e. the binary blobs would have been pre-processed
* before being added to the FIT image).
*
+ * @fit: pointer to fit image
+ * @node: offset of image node
* @image: pointer to the image start pointer
* @size: pointer to the image size
* @return no return value (failure should be handled internally)
*/
-void board_fit_image_post_process(void **p_image, size_t *p_size);
+void board_fit_image_post_process(const void *fit, int node, void **p_image,
+ size_t *p_size);
#define FDT_ERROR ((ulong)(-1))
--
2.17.1
next prev parent reply other threads:[~2021-06-11 8:46 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-11 8:45 [PATCHv6 00/26] HSM rearch series for TI K3 devices Tero Kristo
2021-06-11 8:45 ` [PATCHv6 01/26] lib: rational: copy the rational fraction lib routines from Linux Tero Kristo
2021-06-11 8:45 ` [PATCHv6 02/26] arm: mach-k3: introduce new config option for sysfw split Tero Kristo
2021-06-11 8:45 ` [PATCHv6 03/26] remoteproc: k3-r5: remove sysfw PM calls if not supported Tero Kristo
2021-06-11 8:45 ` Tero Kristo [this message]
2021-06-11 8:45 ` [PATCHv6 05/26] clk: fixed_rate: add API for directly registering fixed rate clocks Tero Kristo
2021-06-11 8:45 ` [PATCHv6 06/26] clk: fix clock tree dump to properly dump out every registered clock Tero Kristo
2021-06-11 8:45 ` [PATCHv6 07/26] clk: do not attempt to fetch clock pointer with null device Tero Kristo
2021-06-11 8:45 ` [PATCHv6 08/26] clk: add support for setting clk rate from cmdline Tero Kristo
2021-06-11 8:45 ` [PATCHv6 09/26] clk: sci-clk: fix return value of set_rate Tero Kristo
2021-06-11 8:45 ` [PATCHv6 10/26] clk: fix assigned-clocks to pass with deferring provider Tero Kristo
2021-06-11 8:45 ` [PATCHv6 11/26] clk: fix set_rate to clean up cached rates for the hierarchy Tero Kristo
2021-06-11 8:45 ` [PATCHv6 12/26] clk: add support for TI K3 SoC PLL Tero Kristo
2021-06-11 8:45 ` [PATCHv6 13/26] clk: add support for TI K3 SoC clocks Tero Kristo
2021-06-11 8:45 ` [PATCHv6 14/26] power: domain: Introduce driver for raw TI K3 PDs Tero Kristo
2021-06-11 8:45 ` [PATCHv6 15/26] cmd: ti: pd: Add debug command for K3 power domains Tero Kristo
2021-06-11 8:45 ` [PATCHv6 16/26] tools: k3_fit_atf: add DM binary to the FIT image Tero Kristo
2021-06-11 8:45 ` [PATCHv6 17/26] arm: mach-k3: Add platform data for j721e and j7200 Tero Kristo
2021-06-11 8:45 ` [PATCHv6 18/26] arm: mach-k3: add support for detecting firmware images from FIT Tero Kristo
2021-06-11 8:45 ` [PATCHv6 19/26] arm: mach-k3: do board config for PM only if supported Tero Kristo
2021-06-11 8:45 ` [PATCHv6 20/26] arm: mach-k3: common: Drop main r5 start Tero Kristo
2021-06-11 8:45 ` [PATCHv6 21/26] arm: mach-k3: sysfw-loader: pass boardcfg to sciserver Tero Kristo
2021-06-11 8:45 ` [PATCHv6 22/26] arm: mach-k3: j721e_init: Force early probe of clk-k3 driver Tero Kristo
2021-06-11 8:45 ` [PATCHv6 23/26] configs: j721e_evm_r5: Enable raw access power management features Tero Kristo
2021-06-11 8:45 ` [PATCHv6 24/26] configs: j7200_evm_r5: " Tero Kristo
2021-06-11 8:45 ` [PATCHv6 25/26] board: ti: j72xx: README: update build instructions and image formats Tero Kristo
2021-06-11 8:45 ` [PATCHv6 26/26] arm: dts: k3-j72xx: correct MCU timer1 frequency Tero Kristo
2021-06-11 11:08 ` [PATCHv6 00/26] HSM rearch series for TI K3 devices Lokesh Vutla
2021-06-11 11:18 ` Tero Kristo
2021-06-11 13:43 ` Lokesh Vutla
2021-06-11 14:13 ` Tom Rini
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=20210611084527.7048-5-kristo@kernel.org \
--to=kristo@kernel.org \
--cc=lokeshvutla@ti.com \
--cc=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 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.